Merge r1419796 from trunk:

mod_proxy_balancer: It's totally unclear what Drn, Dis, Ign, Stby means.
PR 52478
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1431329 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5fd15f5c40538525c9950f61ad8c7601eafce19b..111b7961f095ff3006d7af5febe78471431d246e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) mod_proxy_balancer: Improve output of balancer-manager (re: Drn,
+     Dis, Ign, Stby). PR 52478 [Danijel <dt-ng rbfh de>]
+  
   *) configure: Fix processing of --disable-FEATURE for various features.
      [Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index f2acb856e87547bc6e1f3995c19e8a2174374602..d3977faeec2d01034e73b669916516f26a9d88eb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,12 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_proxy: It's totally unclear what Drn, Dis, Ign, Stby means.
-    PR 52478.
-    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1419796
-    2.4.x patch: trunk patch works + CHANGES to be added
-    +1: jim, humbedooh, jailletc36
-
   * mod_proxy, mod_autoindex: Use ap_rputs instead of ap_rvputs where applicable.
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1418524
     2.4.x patch: trunk patch works

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index de31ac8f6237f4bb5fe4d30b364098cdd23488e8..ac1e6f7343483533850f9c8f0830de7a3403e603 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1505,7 +1505,11 @@ static int balancer_handler(request_rec *r)
                       NULL);
             ap_rputs("\"></td></tr>\n", r);
             ap_rputs("<tr><td>Status:</td>", r);
-            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>Ignore Errors</th>"
+                     "<th>Draining Mode</th>"
+                     "<th>Disabled</th>"
+                     "<th>Hot Standby</th></tr>\n<tr>", 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);