mod_rewrite no longer turns forward proxy requests into reverse proxy

requests.

PR: 28125
Reviewed by: Jeff Trawick, Brad Nicholes

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

diff --git a/CHANGES b/CHANGES
index 1f097babcd9d6b74c1d1d314b55af06d381fa74b..b3ad7afc24032061fb9343760fadfd59aefce1b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) mod_rewrite no longer turns forward proxy requests into reverse proxy
+     requests. PR 28125  [ast domdv.de, André Malo]
+
   *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
      exported on Win32 and Netware as well (minor MMN bump).  PR 28523.
      [Edward Rudd <eddie omegaware.com>, André Malo]

diff --git a/STATUS b/STATUS
index 979788b924dcc9ba55ebdf974fa8ccc45c7e45e4..0ff87c7de6c5e892852c20f11a69612913d3c7c6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/06/11 20:46:40 $]
+Last modified at [$Date: 2004/06/11 21:05:21 $]
 
 Release:
 
@@ -164,11 +164,6 @@ PATCHES TO BACKPORT FROM 2.1
          http://www.apache.org/~nd/mod_rewrite_fixleak.diff
        +1: nd
 
-    *) mod_rewrite no longer turns forward proxy requests into reverse proxy
-       requests. PR 28125
-         modules/mappers/mod_rewrite.c: r1.255
-       +1: nd, trawick, bnicholes
-
     *) (re-)add support for RewriteRules in <Proxy> containers. PR 27985
          modules/mappers/mod_rewrite.c: r1.254
        +1: nd, trawick

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 110f3f8898dd5ed2da744153407704786de05310..9c762722fe65b32f3625bf57550929676f19b810 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1203,7 +1203,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, "go-ahead with proxy request %s [OK]",
@@ -1465,7 +1467,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, "[per-dir %s] go-ahead with proxy request "