svn commit: r1559613 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: ./ mod_proxy.xml mod_proxy.xml.meta

[co...@apache.org]

Author: covener
Date: Mon Jan 20 00:32:07 2014
New Revision: 1559613

URL: http://svn.apache.org/r1559613
Log:
Merge r1517406 from trunk:

PR55352: mention in the <Proxy> manual that the matching is a prefix only, not 
the same context-root / segment-aware matching done by <Location>.



Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta

Propchange: httpd/httpd/branches/2.2.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1517406,1546534,1555116

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml?rev=1559613&r1=1559612&r2=1559613&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml Mon Jan 20 00:32:07 2014
@@ -443,6 +443,20 @@
       &lt;/Proxy&gt;
     </example>
 
+    <note><title>Differences from the Location configuration section</title>
+      <p>A backend URL matches the configuration section if it begins with the 
+      the <var>wildcard-url</var> string, even if the last path segment in the
+      directive only matches a prefix of the backend URL.  For example, 
+      &lt;Proxy http://example.com/foo&gt; matches all of 
+      http://example.com/foo, http://example.com/foo/bar, and 
+      http://example.com/foobar.  The matching of the final URL differs
+      from the behavior of the <directive type="section" module="core"
+      >Location</directive> section, which for purposes of this note 
+      treats the final path component as if it ended in a slash.</p>
+      <p>For more control over the matching, see <directive type="section"
+      >ProxyMatch</directive>.</p>
+    </note>
+
 </usage>
 <seealso><directive type="section" module="mod_proxy">ProxyMatch</directive></seealso>
 </directivesynopsis>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta?rev=1559613&r1=1559612&r2=1559613&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta Mon Jan 20 00:32:07 2014
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>