From d1c5f88220ffa352fd2a274367bca0754d94e48c Mon Sep 17 00:00:00 2001
From: Luca Toscano <elukey@apache.org>
Date: Mon, 8 Feb 2016 22:08:47 +0000
Subject: [PATCH] Added a specific reference of evaluation order between
 ProxyPass and RewriteRule directives. Bug: 54158

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1729281 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_proxy.xml | 5 +++++
 docs/manual/upgrading.xml     | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index f29ea2b7a15..809721948a9 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -799,6 +799,11 @@ expressions</description>
 
     </note> <!-- /ordering_proxypass -->
 
+    <note type="warning"><title>Ordering ProxyPass and RewriteRule Directives</title>
+      <p><directive module="mod_rewrite">RewriteRule</directive> directives
+      are evaluated before <directive module="mod_proxy">ProxyPass</directive> ones.</p>
+    </note>
+
     <p><strong>ProxyPass <code>key=value</code> Parameters</strong></p>
 
     <p>In Apache HTTP Server 2.1 and later, mod_proxy supports pooled
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 80ba457f40a..e9550533499 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -113,6 +113,9 @@
       from <module>mod_auth_digest</module> has been merged with
       <directive module="mod_authn_file">AuthUserFile</directive>
       and is now part of <module>mod_authn_file</module>.</li>
+
+      <li><directive module="mod_rewrite">RewriteRule</directive> directives
+      are evaluated before <directive module="mod_proxy">ProxyPass</directive> ones.</li>
     </ul>
   </section>
 
-- 
2.47.2