From: Graham Leggett <minfrin@apache.org>
Date: Wed, 13 Oct 2004 17:12:09 +0000 (+0000)
Subject: mod_rewrite:Fix query string handling for proxied URLs.
X-Git-Tag: 2.0.53~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d6bd26a5f65510022812c9add4b8d4996c99d4d;p=thirdparty%2Fapache%2Fhttpd.git

mod_rewrite:Fix query string handling for proxied URLs.
PR:	14518
Obtained from:
Submitted by:	michael teitler <michael.teitler cetelem.fr>, Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>
Reviewed by:	nd, jerenkrantz, minfrin


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

diff --git a/CHANGES b/CHANGES
index 2527b20a348..b403961f02f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.53
 
+  *) 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/STATUS b/STATUS
index 9f763f6e387..4b38165c3f5 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/10/13 17:00:14 $]
+Last modified at [$Date: 2004/10/13 17:12:08 $]
 
 Release:
 
@@ -130,11 +130,13 @@ PATCHES TO BACKPORT FROM 2.1
        (2.0 + 1.3)
          http://www.apache.org/~nd/dbmmap_1.3.patch
        +1: nd, trawick, jerenkrantz, jim
+       minfrin: applied to v2.0. Must it be applied to v2.1 still?
 
     *) mod_rewrite:Fix query string handling for proxied URLs. PR 14518.
        (2.0 + 1.3)
          modules/mappers/mod_rewrite.c: r1.259
        +1: nd, jerenkrantz, minfrin
+       minfrin: applied to v2.0
 
     *) mod_rewrite: Handle per-location rules when r->filename is unset.
        Previously this would segfault or simply not match as expected,
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 23770b48fbe..6a5c3b38d03 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1222,7 +1222,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 = apr_pstrcat(r->pool, r->filename,
                                           "?", r->args, NULL);