/[Apache-SVN]/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
ViewVC logotype

Diff of /httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1404653 by jim, Thu Nov 1 16:06:43 2012 UTC revision 1413732 by jim, Mon Nov 26 17:18:54 2012 UTC
# Line 1428  static int balancer_handler(request_rec Line 1428  static int balancer_handler(request_rec
1428                   "}\n"                   "}\n"
1429                   "</style>\n</head>\n", r);                   "</style>\n</head>\n", r);
1430          ap_rputs("<body><h1>Load Balancer Manager for ", r);          ap_rputs("<body><h1>Load Balancer Manager for ", r);
1431          ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);          ap_rvputs(r, ap_escape_html(r->pool, ap_get_server_name(r)),
1432                      "</h1>\n\n", NULL);
1433          ap_rvputs(r, "<dl><dt>Server Version: ",          ap_rvputs(r, "<dl><dt>Server Version: ",
1434                    ap_get_server_description(), "</dt>\n", NULL);                    ap_get_server_description(), "</dt>\n", NULL);
1435          ap_rvputs(r, "<dt>Server Built: ",          ap_rvputs(r, "<dt>Server Built: ",
# Line 1437  static int balancer_handler(request_rec Line 1438  static int balancer_handler(request_rec
1438          for (i = 0; i < conf->balancers->nelts; i++) {          for (i = 0; i < conf->balancers->nelts; i++) {
1439    
1440              ap_rputs("<hr />\n<h3>LoadBalancer Status for ", r);              ap_rputs("<hr />\n<h3>LoadBalancer Status for ", r);
1441              ap_rvputs(r, "<a href='", r->uri, "?b=",              ap_rvputs(r, "<a href=\"", ap_escape_uri(r->pool, r->uri), "?b=",
1442                        balancer->s->name + sizeof(BALANCER_PREFIX) - 1,                        balancer->s->name + sizeof(BALANCER_PREFIX) - 1,
1443                        "&nonce=", balancer->s->nonce,                        "&nonce=", balancer->s->nonce,
1444                        "'>", NULL);                        "\">", NULL);
1445              ap_rvputs(r, balancer->s->name, "</a> [",balancer->s->sname, "]</h3>\n", NULL);              ap_rvputs(r, balancer->s->name, "</a> [",balancer->s->sname, "]</h3>\n", NULL);
1446              ap_rputs("\n\n<table><tr>"              ap_rputs("\n\n<table><tr>"
1447                  "<th>MaxMembers</th><th>StickySession</th><th>DisableFailover</th><th>Timeout</th><th>FailoverAttempts</th><th>Method</th>"                  "<th>MaxMembers</th><th>StickySession</th><th>DisableFailover</th><th>Timeout</th><th>FailoverAttempts</th><th>Method</th>"
# Line 1487  static int balancer_handler(request_rec Line 1488  static int balancer_handler(request_rec
1488              for (n = 0; n < balancer->workers->nelts; n++) {              for (n = 0; n < balancer->workers->nelts; n++) {
1489                  char fbuf[50];                  char fbuf[50];
1490                  worker = *workers;                  worker = *workers;
1491                  ap_rvputs(r, "<tr>\n<td><a href='", r->uri, "?b=",                  ap_rvputs(r, "<tr>\n<td><a href=\"",
1492                              ap_escape_uri(r->pool, r->uri), "?b=",
1493                            balancer->s->name + sizeof(BALANCER_PREFIX) - 1, "&w=",                            balancer->s->name + sizeof(BALANCER_PREFIX) - 1, "&w=",
1494                            ap_escape_uri(r->pool, worker->s->name),                            ap_escape_uri(r->pool, worker->s->name),
1495                            "&nonce=", balancer->s->nonce,                            "&nonce=", balancer->s->nonce,
1496                            "'>", NULL);                            "\">", NULL);
1497                  ap_rvputs(r, worker->s->name, "</a></td>", NULL);                  ap_rvputs(r, worker->s->name, "</a></td>", NULL);
1498                  ap_rvputs(r, "<td>", ap_escape_html(r->pool, worker->s->route),                  ap_rvputs(r, "<td>", ap_escape_html(r->pool, worker->s->route),
1499                            NULL);                            NULL);
# Line 1518  static int balancer_handler(request_rec Line 1520  static int balancer_handler(request_rec
1520          if (wsel && bsel) {          if (wsel && bsel) {
1521              ap_rputs("<h3>Edit worker settings for ", r);              ap_rputs("<h3>Edit worker settings for ", r);
1522              ap_rvputs(r, wsel->s->name, "</h3>\n", NULL);              ap_rvputs(r, wsel->s->name, "</h3>\n", NULL);
1523              ap_rputs("<form method='POST' enctype='application/x-www-form-urlencoded' action='", r);              ap_rputs("<form method=\"POST\" enctype=\"application/x-www-form-urlencoded\" action=\"", r);
1524              ap_rvputs(r, action, "'>\n", NULL);              ap_rvputs(r, ap_escape_uri(r->pool, action), "\">\n", NULL);
1525              ap_rputs("<dl>\n<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);              ap_rputs("<dl>\n<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);
1526              ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbfactor);              ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbfactor);
1527              ap_rputs("<tr><td>LB Set:</td><td><input name='w_ls' id='w_ls' type=text ", r);              ap_rputs("<tr><td>LB Set:</td><td><input name='w_ls' id='w_ls' type=text ", r);
1528              ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbset);              ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbset);
1529              ap_rputs("<tr><td>Route:</td><td><input name='w_wr' id='w_wr' type=text ", r);              ap_rputs("<tr><td>Route:</td><td><input name='w_wr' id='w_wr' type=text ", r);
1530              ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->route),              ap_rvputs(r, "value=\"", ap_escape_html(r->pool, wsel->s->route),
1531                        NULL);                        NULL);
1532              ap_rputs("'></td></tr>\n", r);              ap_rputs("\"></td></tr>\n", r);
1533              ap_rputs("<tr><td>Route Redirect:</td><td><input name='w_rr' id='w_rr' type=text ", r);              ap_rputs("<tr><td>Route Redirect:</td><td><input name='w_rr' id='w_rr' type=text ", r);
1534              ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->redirect),              ap_rvputs(r, "value=\"", ap_escape_html(r->pool, wsel->s->redirect),
1535                        NULL);                        NULL);
1536              ap_rputs("'></td></tr>\n", r);              ap_rputs("\"></td></tr>\n", r);
1537              ap_rputs("<tr><td>Status:</td>", r);              ap_rputs("<tr><td>Status:</td>", r);
1538              ap_rputs("<td><table><tr><th>Ign</th><th>Drn</th><th>Dis</th><th>Stby</th></tr>\n<tr>", r);              ap_rputs("<td><table><tr><th>Ign</th><th>Drn</th><th>Dis</th><th>Stby</th></tr>\n<tr>", r);
1539              create_radio("w_status_I", (PROXY_WORKER_IGNORE_ERRORS & wsel->s->status), r);              create_radio("w_status_I", (PROXY_WORKER_IGNORE_ERRORS & wsel->s->status), r);

Legend:
Removed from v.1404653  
changed lines
  Added in v.1413732

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26