mod_rewrite:Fix query string handling for proxied URLs.

PR:	14518
Obtained from:
Submitted by:
Reviewed by:	nd, minfrin, jim

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

diff --git a/STATUS b/STATUS
index aa8b5e1422a021fa92d4e92bc48b47badcd3d0f4..c88fee686708f4ae29da2a2d1726b25299bb3bed 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 1.3 STATUS:                                             -*-text-*-
-  Last modified at [$Date: 2004/10/13 18:34:16 $]
+  Last modified at [$Date: 2004/10/13 18:44:24 $]
 
 Release:
 
@@ -50,11 +50,6 @@ RELEASE SHOWSTOPPERS:
 
 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)

diff --git a/src/CHANGES b/src/CHANGES
index ac1d5c8f5adef732763bc9479e58e87a4ca11157..2f30ae39de1fcdad49817cb3c129b1be21afc79e 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -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]
 

diff --git a/src/modules/standard/mod_rewrite.c b/src/modules/standard/mod_rewrite.c
index 7e837987bed15a841c10f06ea5dada05cca950ed..369e5928ee3bd0e3e8e8bbd724ba01c748c21a53 100644 (file)
--- a/src/modules/standard/mod_rewrite.c
+++ b/src/modules/standard/mod_rewrite.c
@@ -1116,7 +1116,7 @@ static int hook_uri2file(request_rec *r)
                                          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);