mod_rewrite no longer turns forward proxy requests into reverse proxy

requests.

PR: 28125

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

diff --git a/CHANGES b/CHANGES
index 62c2a8f1d68aff502a7da3264345aa0884135e07..2d612a8fa27085316f6af422e3d7033a7e01b083 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_rewrite no longer turns forward proxy requests into reverse proxy
+     requests. PR 28125  [ast domdv.de, André Malo]
+
   *) mod_rewrite now officially supports RewriteRules in <Proxy> sections.
      PR 27985.  [André Malo]
 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index b7bd6b9bde72d98a3943f759555784fc296a6f50..d489246dd8c02dfe4e1adcf6616d470e58d61e0d 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4211,7 +4211,9 @@ static int hook_uri2file(request_rec *r)
             }
 
             /* now make sure the request gets handled by the proxy handler */
-            r->proxyreq = PROXYREQ_REVERSE;
+            if (PROXYREQ_NONE == r->proxyreq) {
+                r->proxyreq = PROXYREQ_REVERSE;
+            }
             r->handler  = "proxy-server";
 
             rewritelog((r, 1, NULL, "go-ahead with proxy request %s [OK]",
@@ -4439,7 +4441,9 @@ static int hook_fixup(request_rec *r)
             }
 
             /* now make sure the request gets handled by the proxy handler */
-            r->proxyreq = PROXYREQ_REVERSE;
+            if (PROXYREQ_NONE == r->proxyreq) {
+                r->proxyreq = PROXYREQ_REVERSE;
+            }
             r->handler  = "proxy-server";
 
             rewritelog((r, 1, dconf->directory, "go-ahead with proxy request "