From: Nick Kew <niq@apache.org>
Date: Tue, 23 Feb 2010 16:16:04 +0000 (+0000)
Subject: mod_negotiation: Preserve query string over multiviews negotiation.
X-Git-Tag: 2.3.6~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10c2d6bb52becacf8b3d3415594024a1fc03f4f8;p=thirdparty%2Fapache%2Fhttpd.git

mod_negotiation: Preserve query string over multiviews negotiation.
PR 33112
Joergen Thomsen


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

diff --git a/CHANGES b/CHANGES
index 682ef61224e..19edfa49663 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@
 
 Changes with Apache 2.3.7
 
+  *) mod_negotiation: Preserve query string over multiviews negotiation.
+     This buglet was fixed for type maps in 2.2.6, but the same issue
+     affected multiviews and was overlooked.
+     PR 33112 [Joergen Thomsen <apache jth.net>]
+
   *) mod_ldap: Eliminate a potential crash with multiple LDAPTrustedClientCert
      when some are not password-protected. [Eric Covener]
 
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 976c598e740..88819b1622a 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -3129,6 +3129,9 @@ static int handle_multi(request_rec *r)
             goto return_from_multi;
         }
     }
+    if (sub_req->args == NULL) {
+        sub_req->args = r->args;
+    }
 
     /* now do a "fast redirect" ... promotes the sub_req into the main req */
     ap_internal_fast_redirect(sub_req, r);