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/04/30 16:18:46 UTC
svn commit: r1477650 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/proxy/mod_proxy.c
Author: jim
Date: Tue Apr 30 14:18:46 2013
New Revision: 1477650
URL: http://svn.apache.org/r1477650
Log:
Merge r1476680 from trunk:
mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.
Submitted by: minfrin
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1476680
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1477650&r1=1477649&r2=1477650&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Apr 30 14:18:46 2013
@@ -90,26 +90,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy: Allow balancers and ProxyPass to be server-specific, as
- they should have been. Inheritance causes too many behind-the-scene
- interactions to be reliable in a dynamic environ. We maintain the
- old-default of inheritance.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1387603
- http://svn.apache.org/viewvc?view=revision&revision=1388029
- http://svn.apache.org/viewvc?view=revision&revision=1420124
- http://svn.apache.org/viewvc?view=revision&revision=1421288
- http://svn.apache.org/viewvc?view=revision&revision=1421912
- http://svn.apache.org/viewvc?view=revision&revision=1422943
- http://svn.apache.org/viewvc?view=revision&revision=1422980
- http://svn.apache.org/viewvc?view=revision&revision=1430575
- http://svn.apache.org/viewvc?view=revision&revision=1439404
- 2.4.x patch: http://people.apache.org/~jim/patches/proxypassinherit-v2.patch
- +1: jim, druggeri
- rjung: directive help text describes "on" and then says: "(Not recommended if
- using the Balancer Manager)". Since "on" is the default, should we probably
- say "(Setting to Off recommended if using the Balancer Manager)"?
- minfrin: +1 (including http://svn.apache.org/r1476680 as per rjung)
-
* htpasswd: Add -v option
trunk patches: https://svn.apache.org/r1465116
2.4.x patch: trunk patches work
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1477650&r1=1477649&r2=1477650&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Tue Apr 30 14:18:46 2013
@@ -2330,10 +2330,10 @@ static const command_rec proxy_cmds[] =
"on if the balancer should persist changes on reboot/restart made via the Balancer Manager"),
AP_INIT_FLAG("BalancerInherit", set_inherit, NULL, RSRC_CONF,
"on if this server should inherit Balancers and Workers defined in the main server "
- "(Not recommended if using the Balancer Manager for dynamic changes)"),
+ "(Setting to off recommended if using the Balancer Manager)"),
AP_INIT_FLAG("ProxyPassInherit", set_ppinherit, NULL, RSRC_CONF,
"on if this server should inherit all ProxyPass directives defined in the main server "
- "(Not recommended if using the Balancer Manager for dynamic changes)"),
+ "(Setting to off recommended if using the Balancer Manager)"),
AP_INIT_TAKE1("ProxyStatus", set_status_opt, NULL, RSRC_CONF,
"Configure Status: proxy status to one of: on | off | full"),
AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF,