Merge r1476680 from trunk:

mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.

Submitted by: minfrin
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index a22aa26f2cbf5de804997574bbab6b328e613f7c..02dcd96e20a8d32bf98b02b5d10b1ca5966a34ab 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 50416f4d018b1fafd1a57cadb1f2ddf512d3891e..83c003b80532a975a926a85150273bfd75ef82fd 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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,