svn commit: r1420124 - in /httpd/httpd/trunk: docs/manual/mod/mod_proxy.xml modules/proxy/mod_proxy.c

[ji...@apache.org]

Author: jim
Date: Tue Dec 11 12:35:50 2012
New Revision: 1420124

URL: http://svn.apache.org/viewvc?rev=1420124&view=rev
Log:
rjung's suggestions...

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
    httpd/httpd/trunk/modules/proxy/mod_proxy.c

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=1420124&r1=1420123&r2=1420124&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Tue Dec 11 12:35:50 2012
@@ -666,22 +666,6 @@ expressions</description>
 </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>
     <syntax>BalancerMember [<var>balancerurl</var>] <var>url</var> [<var
@@ -1212,6 +1196,22 @@ ProxyPass / balancer://hotcluster/ 
 </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>
 <syntax>ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1420124&r1=1420123&r2=1420124&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Dec 11 12:35:50 2012
@@ -1160,7 +1160,7 @@ static void * create_proxy_config(apr_po
     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"),