diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index df613fe2fe..93921b8761 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -2075,12 +2075,17 @@ static int proxy_status_hook(request_rec *r, int flags) ap_rputs("\n\n" "" "\n", r); - if (strcmp(balancer->sticky, balancer->sticky_path)) { - ap_rvputs(r, "", apr_time_sec(balancer->timeout)); diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 1a1d776334..9d9c1fc560 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -758,11 +758,17 @@ static int balancer_handler(request_rec *r) ap_rputs("\n\n
SSesTimeoutMethod
", balancer->sticky, " | ", balancer->sticky_path, - NULL); + if (balancer->sticky) { + if (strcmp(balancer->sticky, balancer->sticky_path)) { + ap_rvputs(r, "", balancer->sticky, " | ", + balancer->sticky_path, NULL); + } + else { + ap_rvputs(r, "", balancer->sticky, NULL); + } } else { - ap_rvputs(r, "", balancer->sticky, NULL); + ap_rputs(" - ", r); } ap_rprintf(r, "%" APR_TIME_T_FMT "
" "" "\n", r); - if (strcmp(balancer->sticky, balancer->sticky_path)) { - ap_rvputs(r, "", apr_time_sec(balancer->timeout));
StickySessionTimeoutFailoverAttemptsMethod
", balancer->sticky, " | ", balancer->sticky_path, NULL); + if (balancer->sticky) { + if (strcmp(balancer->sticky, balancer->sticky_path)) { + ap_rvputs(r, "", balancer->sticky, " | ", + balancer->sticky_path, NULL); + } + else { + ap_rvputs(r, "", balancer->sticky, NULL); + } } else { - ap_rvputs(r, "", balancer->sticky, NULL); + ap_rputs(" - ", r); } ap_rprintf(r, "%" APR_TIME_T_FMT "