Index: modules/proxy/mod_proxy_balancer.c =================================================================== --- modules/proxy/mod_proxy_balancer.c (revision 598987) +++ modules/proxy/mod_proxy_balancer.c (working copy) @@ -24,6 +24,10 @@ #include "apr_version.h" #include "apr_hooks.h" +#if APR_HAVE_UNISTD_H +#include /* for getpid() */ +#endif + module AP_MODULE_DECLARE_DATA proxy_balancer_module; static int proxy_balancer_canon(request_rec *r, char *url) @@ -650,33 +654,10 @@ } } /* First set the params */ - if (bsel) { - const char *val; - if ((val = apr_table_get(params, "ss"))) { - if (strlen(val)) - bsel->sticky = apr_pstrdup(conf->pool, val); - else - bsel->sticky = NULL; - } - if ((val = apr_table_get(params, "tm"))) { - int ival = atoi(val); - if (ival >= 0) - bsel->timeout = apr_time_from_sec(ival); - } - if ((val = apr_table_get(params, "fa"))) { - int ival = atoi(val); - if (ival >= 0) - bsel->max_attempts = ival; - bsel->max_attempts_set = 1; - } - if ((val = apr_table_get(params, "lm"))) { - proxy_balancer_method *provider; - provider = ap_lookup_provider(PROXY_LBMETHOD, val, "0"); - if (provider) { - bsel->lbmethod = provider; - } - } - } + /* + * Note that it is not possible set the proxy_balancer because it is not + * in shared memory. + */ if (wsel) { const char *val; if ((val = apr_table_get(params, "lf"))) { @@ -756,14 +737,16 @@ for (i = 0; i < conf->balancers->nelts; i++) { ap_rputs("
\n

LoadBalancer Status for ", r); - ap_rvputs(r, "uri, "?b=", - balancer->name + sizeof("balancer://") - 1, - "\">", NULL); - ap_rvputs(r, balancer->name, "

\n\n", NULL); + ap_rvputs(r, balancer->name, "\n\n", NULL); ap_rputs("\n\n" "" "\n", r); - ap_rvputs(r, "", apr_time_sec(balancer->timeout)); ap_rprintf(r, "\n", balancer->max_attempts); @@ -824,10 +807,10 @@ ap_rputs("\n", wsel->s->lbset); ap_rputs("\n", r); ap_rputs("\n", r); ap_rputs("
StickySessionTimeoutFailoverAttemptsMethod
", balancer->sticky, NULL); + if (balancer->sticky) { + ap_rvputs(r, "", balancer->sticky, NULL); + } + else { + ap_rputs(" - ", r); + } ap_rprintf(r, "%" APR_TIME_T_FMT "%d
LB Set:
Route:route, NULL); + ap_rvputs(r, "value=\"", wsel->s->route, NULL); ap_rputs("\">
Route Redirect:redirect, NULL); + ap_rvputs(r, "value=\"", wsel->s->redirect, NULL); ap_rputs("\">
Status:Disabled: s->status & PROXY_WORKER_DISABLED) @@ -844,41 +827,6 @@ "\">\n\n", NULL); ap_rputs("
\n", r); } - else if (bsel) { - ap_rputs("

Edit balancer settings for ", r); - ap_rvputs(r, bsel->name, "

\n", NULL); - ap_rvputs(r, "
uri, "\">\n
", NULL); - ap_rputs("\n\n", - apr_time_sec(bsel->timeout)); - ap_rputs("\n", - bsel->max_attempts); - ap_rputs("\n", r); - ap_rputs("\n", r); - ap_rvputs(r, "
StickySession Identifier:sticky) - ap_rvputs(r, "value=\"", bsel->sticky, "\"", NULL); - ap_rputs(">
Timeout:
Failover Attempts:
LB Method:
\nname + sizeof("balancer://") - 1, - "\">\n\n", NULL); - ap_rputs("
\n", r); - } ap_rputs(ap_psignature("",r), r); ap_rputs("\n", r); } Index: modules/proxy/mod_proxy.c =================================================================== --- modules/proxy/mod_proxy.c (revision 598987) +++ modules/proxy/mod_proxy.c (working copy) @@ -2017,7 +2017,12 @@ ap_rputs("\n\n" "" "\n", r); - ap_rvputs(r, "", apr_time_sec(balancer->timeout)); ap_rprintf(r, "\n",
SSesTimeoutMethod
", balancer->sticky, NULL); + if (balancer->sticky) { + ap_rvputs(r, "", balancer->sticky, NULL); + } + else { + ap_rputs(" - ", r); + } ap_rprintf(r, "%" APR_TIME_T_FMT "%s