From 7d2f6e5d4327d5ec5c7ec13cd7a1f5aa48eb95af Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Mon, 20 Jan 2014 00:32:07 +0000
Subject: [PATCH] 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>.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1559613 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_proxy.xml      | 14 ++++++++++++++
 docs/manual/mod/mod_proxy.xml.meta |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index d40f9537295..fa810c578e4 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -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>
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index 38a79fdda73..f0185375d44 100644
--- a/docs/manual/mod/mod_proxy.xml.meta
+++ b/docs/manual/mod/mod_proxy.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
-- 
2.47.3