You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2004/10/13 20:44:25 UTC
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
minfrin 2004/10/13 11:44:25
Modified: . STATUS
src CHANGES
src/modules/standard mod_rewrite.c
Log:
mod_rewrite:Fix query string handling for proxied URLs.
PR: 14518
Reviewed by: nd, minfrin, jim
Revision Changes Path
1.1107 +1 -6 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -r1.1106 -r1.1107
--- STATUS 13 Oct 2004 18:34:16 -0000 1.1106
+++ STATUS 13 Oct 2004 18:44:24 -0000 1.1107
@@ -50,11 +50,6 @@
PROPOSED PATCHES FOR THIS RELEASE:
- *) mod_rewrite:Fix query string handling for proxied URLs. PR 14518.
- modules/mappers/mod_rewrite.c: r1.259 (2.x patch)
- http://issues.apache.org/bugzilla/showattachment.cgi?attach_id=13078
- +1: nd, minfrin, jim
-
*) mod_log_config: Cleanup log_header_out function to allow multiple headers
like Set-Cookie to be logged properly. PR 27787
modules/loggers/mod_log_config.c: r1.116 (2.x patch - need 1.3 version)
1.1958 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -r1.1957 -r1.1958
--- CHANGES 30 Sep 2004 17:12:41 -0000 1.1957
+++ CHANGES 13 Oct 2004 18:44:25 -0000 1.1958
@@ -1,5 +1,9 @@
Changes with Apache 1.3.32
+ *) mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
+ [michael teitler <michael.teitler cetelem.fr>,
+ Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]
+
*) mod_rewrite: Fix 0 bytes write into random memory position.
PR 31036. [Andr� Malo]
1.198 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- mod_rewrite.c 30 Sep 2004 17:12:42 -0000 1.197
+++ mod_rewrite.c 13 Oct 2004 18:44:25 -0000 1.198
@@ -1116,7 +1116,7 @@
r->path_info, NULL);
}
if (r->args != NULL &&
- r->uri == r->unparsed_uri) {
+ r->uri != r->unparsed_uri) {
/* see proxy_http:proxy_http_canon() */
r->filename = ap_pstrcat(r->pool, r->filename,
"?", r->args, NULL);