You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/04/03 22:29:38 UTC
cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
nd 2004/04/03 12:29:37
Modified: . CHANGES
modules/mappers mod_rewrite.c
Log:
mod_rewrite no longer turns forward proxy requests into reverse proxy
requests.
PR: 28125
Revision Changes Path
1.1444 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -u -r1.1443 -r1.1444
--- CHANGES 30 Mar 2004 21:07:39 -0000 1.1443
+++ CHANGES 3 Apr 2004 20:29:37 -0000 1.1444
@@ -2,6 +2,9 @@
[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]
1.255 +6 -2 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -u -r1.254 -r1.255
--- mod_rewrite.c 29 Mar 2004 21:34:19 -0000 1.254
+++ mod_rewrite.c 3 Apr 2004 20:29:37 -0000 1.255
@@ -4211,7 +4211,9 @@
}
/* 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 @@
}
/* 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 "