You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2013/05/21 13:40:29 UTC

svn commit: r1484766 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/ docs/manual/mod/ docs/manual/mod/mod_proxy.xml docs/manual/mod/mod_proxy_balancer.xml docs/manual/mod/mod_proxy_fcgi.xml docs/manual/mod/mod_proxy_scgi.xml

Author: takashi
Date: Tue May 21 11:40:29 2013
New Revision: 1484766

URL: http://svn.apache.org/r1484766
Log:
Merge r1421851 from trunk:

Fix use of trailing slashes in proxy
balancer and member URLs and add a little
explanation.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1421851

Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual:r1421851

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1421851

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1484766&r1=1484765&r2=1484766&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Tue May 21 11:40:29 2013
@@ -722,6 +722,11 @@ expressions</description>
         <p>The balancerurl is only needed when not in <code>&lt;Proxy <var>balancer://</var>...&gt;</code>
             container directive. It corresponds to the url of a balancer defined in
             <directive module="mod_proxy">ProxyPass</directive> directive.</p>
+        <p>The path component of the balancer URL in any
+            <code>&lt;Proxy <var>balancer://</var>...&gt;</code> container directive
+            is ignored.</p>
+        <p>Trailing slashes should typically be removed from the URL of a
+            <code>BalancerMember</code>.</p>
     </usage>
 </directivesynopsis>
 
@@ -747,8 +752,8 @@ expressions</description>
     <example>
         <highlight language="config">
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember http://www2.example.com:8080/ loadfactor=1
-    BalancerMember http://www3.example.com:8080/ loadfactor=2
+    BalancerMember http://www2.example.com:8080 loadfactor=1
+    BalancerMember http://www3.example.com:8080 loadfactor=2
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
       </highlight>
@@ -1075,7 +1080,7 @@ ProxyPass /mirror/foo http://backend.exa
     </table>
 
     <p>If the Proxy directive scheme starts with the
-    <code>balancer://</code> (eg: <code>balancer://cluster/</code>,
+    <code>balancer://</code> (eg: <code>balancer://cluster</code>,
     any path information is ignored)  then a virtual worker that does not really
     communicate with the backend server will be created. Instead it is responsible
     for the management of several "real" workers. In that case the special set of
@@ -1179,22 +1184,22 @@ ProxyPass /mirror/foo http://backend.exa
 ProxyPass /special-area http://special.example.com smax=5 max=10
 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
 &lt;Proxy balancer://mycluster&gt;
-    BalancerMember ajp://1.2.3.4:8009/
-    BalancerMember ajp://1.2.3.5:8009/ loadfactor=20
+    BalancerMember ajp://1.2.3.4:8009
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=20
     # Less powerful server, don't send as many requests there,
-    BalancerMember ajp://1.2.3.6:8009/ loadfactor=5
+    BalancerMember ajp://1.2.3.6:8009 loadfactor=5
 &lt;/Proxy&gt;
     </highlight>
 
     <p>Setting up a hot-standby, that will only be used if no other
      members are available</p>
     <highlight language="config">
-ProxyPass / balancer://hotcluster/ 
+ProxyPass / balancer://hotcluster/
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember ajp://1.2.3.4:8009/ loadfactor=1
-    BalancerMember ajp://1.2.3.5:8009/ loadfactor=2
+    BalancerMember ajp://1.2.3.4:8009 loadfactor=1
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=2
     # The server below is on hot standby
-    BalancerMember ajp://1.2.3.6:8009/ status=+H
+    BalancerMember ajp://1.2.3.6:8009 status=+H
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
     </highlight>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml?rev=1484766&r1=1484765&r2=1484766&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml Tue May 21 11:40:29 2013
@@ -92,12 +92,12 @@
     </p>
 
     <highlight language="config">
-&lt;Proxy balancer://mycluster/&gt;
-    BalancerMember http://192.168.1.50:80/
-    BalancerMember http://192.168.1.51:80/
+&lt;Proxy balancer://mycluster&gt;
+    BalancerMember http://192.168.1.50:80
+    BalancerMember http://192.168.1.51:80
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster/
-ProxyPassReverse /test balancer://mycluster/
+ProxyPass /test balancer://mycluster
+ProxyPassReverse /test balancer://mycluster
     </highlight>
 
     <p>Another example of how to provide load balancing with stickyness
@@ -107,13 +107,13 @@ ProxyPassReverse /test balancer://myclus
 
     <highlight language="config">
 Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
-&lt;Proxy balancer://mycluster/&gt;
-    BalancerMember http://192.168.1.50:80/ route=1
-    BalancerMember http://192.168.1.51:80/ route=2
+&lt;Proxy balancer://mycluster&gt;
+    BalancerMember http://192.168.1.50:80 route=1
+    BalancerMember http://192.168.1.51:80 route=2
     ProxySet stickysession=ROUTEID
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster/
-ProxyPassReverse /test balancer://mycluster/
+ProxyPass /test balancer://mycluster
+ProxyPassReverse /test balancer://mycluster
     </highlight>
 </section>
 
@@ -140,7 +140,7 @@ ProxyPassReverse /test balancer://myclus
     <dt><var><a name="balancer_name" id="balancer_name">BALANCER_NAME</a></var></dt>
     <dd>
     <p>This is assigned the name of the balancer used for the current
-    request. The value is something like <code>balancer://foo/</code>.</p>
+    request. The value is something like <code>balancer://foo</code>.</p>
     </dd>
 
     <!-- ============= BALANCER_WORKER_NAME ================== -->
@@ -249,10 +249,10 @@ ProxyPassReverse /test balancer://myclus
     configuring the name of the cookie and the name of the URL parameter
     separated by a vertical bar (<code>|</code>) as in the following example:</p>
     <highlight language="config">
-ProxyPass /test balancer://mycluster/ stickysession=JSESSIONID|jsessionid scolonpathdelim=On
+ProxyPass /test balancer://mycluster stickysession=JSESSIONID|jsessionid scolonpathdelim=On
 &lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80/ route=node1
-    BalancerMember http://192.168.1.51:80/ route=node2
+    BalancerMember http://192.168.1.50:80 route=node1
+    BalancerMember http://192.168.1.51:80 route=node2
 &lt;/Proxy&gt;
     </highlight>
     <p>If the cookie and the request parameter both provide routing information

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml?rev=1484766&r1=1484765&r2=1484766&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml Tue May 21 11:40:29 2013
@@ -93,8 +93,8 @@
     <highlight language="config">
 ProxyPass /myapp/ balancer://myappcluster/
 &lt;Proxy balancer://myappcluster/&gt;
-    BalancerMember fcgi://localhost:4000/
-    BalancerMember fcgi://localhost:4001/
+    BalancerMember fcgi://localhost:4000
+    BalancerMember fcgi://localhost:4001
 &lt;/Proxy&gt;
     </highlight>
     </example>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.xml?rev=1484766&r1=1484765&r2=1484766&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.xml Tue May 21 11:40:29 2013
@@ -69,9 +69,9 @@
     <example><title>Balanced gateway</title>
     <highlight language="config">
 ProxyPass /scgi-bin/ balancer://somecluster/
-&lt;Proxy balancer://somecluster/&gt;
-    BalancerMember scgi://localhost:4000/
-    BalancerMember scgi://localhost:4001/
+&lt;Proxy balancer://somecluster&gt;
+    BalancerMember scgi://localhost:4000
+    BalancerMember scgi://localhost:4001
 &lt;/Proxy&gt;
     </highlight>
     </example>