Fix query string handling for proxied URLs.

PR: 14518
Submitted by: michael teitler <michael.teitler cetelem.fr>,
    Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>

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

diff --git a/CHANGES b/CHANGES
index 46e2eeba574cd0d4b06f35fef0e3522c876290e2..44ea2575ad749f3daee13f7c78fab01993e7d668 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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>]
+
   *) Recognize QSA flag in mod_rewrite again.
      [Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]
 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index e2e9207943e11c0b6790e6395a206ff6ce27feae..58f9a78e494322f8f983ebee7b7a39ec45019d2e 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4274,7 +4274,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);