You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/01/10 13:58:59 UTC
svn commit: r1431329 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/proxy/mod_proxy_balancer.c
Author: jim
Date: Thu Jan 10 12:58:58 2013
New Revision: 1431329
URL: http://svn.apache.org/viewvc?rev=1431329&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1419796
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1431329&r1=1431328&r2=1431329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Jan 10 12:58:58 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1431329&r1=1431328&r2=1431329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 10 12:58:58 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c?rev=1431329&r1=1431328&r2=1431329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c Thu Jan 10 12:58:58 2013
@@ -1505,7 +1505,11 @@ static int balancer_handler(request_rec
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);