docs rebuild

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 0878db4cec94f80edeb85d85f91c0a90c89842d8..e9cfbf76cad3cccd47cdebf7401603f8ea2df6ad 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1111,6 +1111,18 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
     <code>backend.example.com</code> <em>except</em> requests made to
     <code>/mirror/foo/i</code>.</p>
 
+    <p>Mixing ProxyPass settings in different contexts does not work:</p>
+    <pre class="prettyprint lang-config">ProxyPass "/mirror/foo/i" "!"
+&lt;Location "/mirror/foo/"&gt;
+    ProxyPass "http://backend.example.com/"
+&lt;/Location&gt;</pre>
+
+    <p>In this case, a request to <code>/mirror/foo/i</code> will get proxied,
+       because the <code class="directive">ProxyPass</code> directive in the Location block will be evaluated
+       first. The fact that <code class="directive">ProxyPass</code> supports both server and directory contexts
+       does not mean that their scope and position in the configuration file will
+       guarantee any ordering or override.</p>
+
     <div class="warning"><h3>Ordering ProxyPass Directives</h3>
       <p>The configured <code class="directive"><a href="#proxypass">ProxyPass</a></code>
       and <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code>
@@ -1119,12 +1131,15 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
       <code class="directive"><a href="#proxypass">ProxyPass</a></code> rules starting with the
       longest URLs first. Otherwise, later rules for longer URLS will be hidden
       by any earlier rule which uses a leading substring of the URL. Note that
-      there is some relation with worker sharing. In contrast, only one
-      <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive can be placed
-      in a <code class="directive"><a href="../mod/core.html#location">Location</a></code> block, and the most
-      specific location will take precedence.</p>
-
-      <p>For the same reasons, exclusions must come <em>before</em> the
+      there is some relation with worker sharing.</p>
+    </div>
+    <div class="warning"><h3>Ordering ProxyPass Directives in Locations</h3>
+      <p>Only one <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive
+      can be placed in a <code class="directive"><a href="../mod/core.html#location">Location</a></code> block,
+      and the most specific location will take precedence.</p>
+    </div>
+    <div class="warning"><h3>Exclusions and the no-proxy environment variable</h3>
+      <p>Exclusions must come <em>before</em> the
       general <code class="directive">ProxyPass</code> directives. In 2.4.26 and later, the "no-proxy"
       environment variable is an alternative to exclusions, and is the only
       way to configure an exclusion of a <code class="directive">ProxyPass</code>