summaryrefslogtreecommitdiff
path: root/modules/proxy
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2013-09-26 11:15:41 +0000
committerJim Jagielski <jim@apache.org>2013-09-26 11:15:41 +0000
commitd5db3dc7393eb1c04c25b986342a4f6024cc9376 (patch)
tree3bdbf2bfd6e10aa2bea4f2101b74c2158c5c7cd1 /modules/proxy
parent384bb7ddd9c76e66734ec7bb6aa9e13f7a313762 (diff)
downloadhttpd-d5db3dc7393eb1c04c25b986342a4f6024cc9376.tar.gz
Merge r1524158 from trunk:
More cool info ;) Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1526444 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
-rw-r--r--modules/proxy/mod_proxy_balancer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index ddbbb9ed30..5fd9e1513c 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1466,6 +1466,10 @@ static int balancer_handler(request_rec *r)
ap_get_server_built(), "</dt>\n", NULL);
ap_rvputs(r, "<dt>Balancer changes will ", conf->bal_persist ? "" : "NOT ",
"be persisted on restart.</dt>", NULL);
+ ap_rvputs(r, "<dt>Balancers are ", conf->inherit ? "" : "NOT ",
+ "inherited from main server.</dt>", NULL);
+ ap_rvputs(r, "<dt>ProxyPass settings are ", conf->ppinherit ? "" : "NOT ",
+ "inherited from main server.</dt>", NULL);
ap_rputs("</dl>\n", r);
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {