From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Dec 2012 15:24:40 +0000 (+0000)
Subject: Redfine - we are just worried about balancers and workers, so have the directive... 
X-Git-Tag: 2.5.0-alpha~5976
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26ecd7b2fe4c9aea28088f6a598bb791526e108d;p=apache

Redfine - we are just worried about balancers and workers, so have the directive clear about that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422980 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e92275f047..17098e4cc1 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -663,7 +663,24 @@ expressions</description>
         normal restart/graceful state transitions.</p>
     </usage>
 </directivesynopsis>
-    
+
+<directivesynopsis>
+    <name>BalancerInherit</name>
+    <description>Inherit ProxyPassed Balancers/Workers from the main server</description>
+    <syntax>ProxyPassInherit On|Off</syntax>
+    <default>ProxyPassInherit On</default>
+    <contextlist><context>server config</context><context>virtual host</context></contextlist>
+    <compatibility>ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+        and later.</compatibility>
+    <usage>
+        <p>This directive will cause the current server/vhost to "inherit" ProxyPass
+            Balancers and Workers defined in the main server. This can cause issues and
+            inconsistent behavior if using the Balancer Manager and so should be disabled
+            if using that feature.</p>
+        <p>The setting in the global server defines the default for all vhosts.</p>
+    </usage>
+</directivesynopsis>
+
 <directivesynopsis>
     <name>BalancerMember</name>
     <description>Add a member to a load balancing group</description>
@@ -1195,23 +1212,6 @@ ProxyPass / balancer://hotcluster/
 </usage>
 </directivesynopsis>
 
-<directivesynopsis>
-    <name>ProxyPassInherit</name>
-    <description>Inherit ProxyPass Balancers/Workers from the main server</description>
-    <syntax>ProxyPassInherit On|Off</syntax>
-    <default>ProxyPassInherit On</default>
-    <contextlist><context>server config</context><context>virtual host</context></contextlist>
-    <compatibility>ProxyPassInherit is only available in Apache HTTP Server 2.5.0
-        and later.</compatibility>
-    <usage>
-        <p>This directive will cause the current server/vhost to "inherit" ProxyPass
-            Balancers and Workers defined in the main server. This can cause issues and
-            inconsistent behavior if using the Balancer Manager and so should be disabled
-            if using that feature.</p>
-        <p>The setting in the global server defines the default for all vhosts.</p>
-    </usage>
-</directivesynopsis>
-
 <directivesynopsis>
 <name>ProxyPassMatch</name>
 <description>Maps remote servers into the local server URL-space using regular expressions</description>
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 7be65dcd7d..b7623b34ed 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2300,8 +2300,8 @@ static const command_rec proxy_cmds[] =
      "Number of additional Balancers that can be added post-config"),
     AP_INIT_FLAG("BalancerPersist", set_persist, NULL, RSRC_CONF,
      "on if the balancer should persist changes on reboot/restart made via the Balancer Manager"),
-    AP_INIT_FLAG("ProxyPassInherit", set_inherit, NULL, RSRC_CONF,
-     "on if this server should inherit ProxyPass balancers and workers defined in the main server "
+    AP_INIT_FLAG("BalancerInherit", set_inherit, NULL, RSRC_CONF,
+     "on if this server should inherit ProxyPassed balancers and workers defined in the main server "
      "(Not 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"),