From: Jim Jagielski Date: Wed, 30 Nov 2011 13:15:51 +0000 (+0000) Subject: Merge r1208411 from trunk: X-Git-Tag: 2.3.16~74 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bf4cfa33cd6fcd5bf2f2c4dc2881e6f0c287eff;p=apache Merge r1208411 from trunk: use a style sheet... ideally we would pull one off the filesystem, but for now... Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208412 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index cb4df557d8..d19e8c9c84 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -1183,7 +1183,34 @@ static int balancer_handler(request_rec *r) else { ap_set_content_type(r, "text/html; charset=ISO-8859-1"); ap_rputs(DOCTYPE_HTML_3_2 - "Balancer Manager\n", r); + "Balancer Manager\n", r); + ap_rputs("\n\n", r); ap_rputs("

Load Balancer Manager for ", r); ap_rvputs(r, ap_get_server_name(r), "

\n\n", NULL); ap_rvputs(r, "
Server Version: ", @@ -1199,44 +1226,44 @@ static int balancer_handler(request_rec *r) "&nonce=", balancer->s->nonce, "'>", NULL); ap_rvputs(r, balancer->s->name, "\n", NULL); - ap_rputs("\n\n" + ap_rputs("\n\n
" "" "\n", r); /* the below is a safe cast, since the number of slots total will * never be more than max_workers, which is restricted to int */ - ap_rprintf(r, "\n", balancer->max_workers, + ap_rprintf(r, "\n", balancer->max_workers, balancer->max_workers - (int)storage->num_free_slots(balancer->wslot)); if (*balancer->s->sticky) { if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) { - ap_rvputs(r, "\n", + ap_rprintf(r, "\n", balancer->s->sticky_force ? "On" : "Off"); - ap_rprintf(r, "", + ap_rprintf(r, "", apr_time_sec(balancer->s->timeout)); - ap_rprintf(r, "\n", balancer->s->max_attempts); - ap_rprintf(r, "\n", + ap_rprintf(r, "\n", balancer->s->max_attempts); + ap_rprintf(r, "\n", balancer->s->lbpname); - ap_rputs("\n", NULL); - ap_rprintf(r, "\n", + ap_rprintf(r, "\n", !balancer->s->inactive ? "Yes" : "No"); ap_rputs("
MaxMembersStickySessionDisableFailoverTimeoutFailoverAttemptsMethodPathActive
%d [%d Used]%d [%d Used]", balancer->s->sticky, " | ", + ap_rvputs(r, "", balancer->s->sticky, " | ", balancer->s->sticky_path, NULL); } else { - ap_rvputs(r, "", balancer->s->sticky, NULL); + ap_rvputs(r, "", balancer->s->sticky, NULL); } } else { - ap_rputs(" (None) ", r); + ap_rputs(" (None) ", r); } - ap_rprintf(r, "%s%s%" APR_TIME_T_FMT "%" APR_TIME_T_FMT "%d%s%d%s", r); + ap_rputs("", r); if (balancer->s->vhost && *(balancer->s->vhost)) { ap_rvputs(r, balancer->s->vhost, " -> ", NULL); } ap_rvputs(r, balancer->s->vpath, "%s%s
\n
", r); - ap_rputs("\n\n" + ap_rputs("\n\n
" "" "" - "" + "" "" "\n", r); @@ -1250,19 +1277,19 @@ static int balancer_handler(request_rec *r) "&nonce=", balancer->s->nonce, "'>", NULL); ap_rvputs(r, worker->s->name, "", NULL); - ap_rvputs(r, "", worker->s->lbfactor); - ap_rprintf(r, "", worker->s->lbfactor); + ap_rprintf(r, "", r); - ap_rprintf(r, "", worker->s->elected); - ap_rprintf(r, "", worker->s->busy); - ap_rprintf(r, "", worker->s->elected); + ap_rprintf(r, "", worker->s->busy); + ap_rprintf(r, "\n", r); @@ -1290,7 +1317,7 @@ static int balancer_handler(request_rec *r) NULL); ap_rputs("'>\n", r); ap_rputs("", r); - ap_rputs("
Worker URLRouteRouteRedirFactorSetStatusFactorSetStatusElectedBusyLoadToFrom
", ap_escape_html(r->pool, worker->s->route), + ap_rvputs(r, "", ap_escape_html(r->pool, worker->s->route), NULL); - ap_rvputs(r, "", + ap_rvputs(r, "", ap_escape_html(r->pool, worker->s->redirect), NULL); - ap_rprintf(r, "%d%d", worker->s->lbset); + ap_rprintf(r, "%d%d", worker->s->lbset); ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, worker), NULL); ap_rputs("%" APR_SIZE_T_FMT "%" APR_SIZE_T_FMT "%d", worker->s->lbstatus); + ap_rprintf(r, "%" APR_SIZE_T_FMT "%" APR_SIZE_T_FMT "%d", worker->s->lbstatus); ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r); - ap_rputs("", r); + ap_rputs("", r); ap_rputs(apr_strfsize(worker->s->read, fbuf), r); ap_rputs("
Status:\n", r); + ap_rputs("
IgnDrnDisStby
\n", r); create_radio("w_status_I", (PROXY_WORKER_IGNORE_ERRORS & wsel->s->status), r); create_radio("w_status_N", (PROXY_WORKER_DRAIN & wsel->s->status), r); create_radio("w_status_D", (PROXY_WORKER_DISABLED & wsel->s->status), r);
IgnDrnDisStby