rjung's suggestions...

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 63b1fa7964cfff5039e7f2b30837adcaf639c395..9b7ce53e4868e98fda0b76f9ff4181e087f78d49 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -665,22 +665,6 @@ expressions</description>
     </usage>
 </directivesynopsis>
     
-<directivesynopsis>
-    <name>BalancerInherit</name>
-    <description>Inherit Balancers from the main server</description>
-    <syntax>BalancerInherit On|Off</syntax>
-    <default>BalancerInherit Off</default>
-    <contextlist><context>server config</context><context>virtual host</context></contextlist>
-    <compatibility>BalancerInherit 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" Balancers
-            defined in the main server. This can cause issues and inconsistent
-            behavior if using the Balancer Manager and so is disabled
-            by default.</p>
-    </usage>
-</directivesynopsis>
-
 <directivesynopsis>
     <name>BalancerMember</name>
     <description>Add a member to a load balancing group</description>
@@ -1211,6 +1195,22 @@ 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>
+    </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 25040e738b8a7dfe31f6cc79a0cf8398503180de..59026755ae31b98c4d17e0e82e3d0bba15c41508 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1160,7 +1160,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s)
     ps->req = 0;
     ps->max_balancers = 0;
     ps->bal_persist = 0;
-    ps->inherit = 0;
+    ps->inherit = 1;
     ps->bgrowth = 5;
     ps->bgrowth_set = 0;
     ps->req_set = 0;
@@ -2301,8 +2301,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("BalancerInherit", set_inherit, NULL, RSRC_CONF,
-     "on if this server should inherit balancers defined in the main server "
+    AP_INIT_FLAG("ProxyPassInherit", set_inherit, NULL, RSRC_CONF,
+     "on if this server should inherit ProxyPass 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"),