From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 6 Oct 2010 10:30:11 +0000 (+0000)
Subject: PR 33112 - Fix for query string preservation after content negotiation.
X-Git-Tag: 2.0.64~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ecd829ceba3ab19269d01323ed7b145fcd34d2;p=thirdparty%2Fapache%2Fhttpd.git

PR 33112 - Fix for query string preservation after content negotiation.
r1002165 in test framework needs to be revertet now since this is fixed.
Author rjung, reviewed by wrowe, sf.


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

diff --git a/STATUS b/STATUS
index 5f2ccddb33f..854d7557bcc 100644
--- a/STATUS
+++ b/STATUS
@@ -132,13 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_negotiation: PR 33112 - Fix for query string preservation after content negotiation
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=915407
-    2.2.x patch: http://svn.apache.org/viewvc?view=revision&revision=917017
-    Backport: http://people.apache.org/~rjung/patches/pr-33112-2_0.patch
-    Revert r1002165 in test framework, once this is fixed.
-    +1: rjung, wrowe, sf
-
   * mod_expires: Expires time shouldn't be in the past
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=708902
     2.2.x patch: http://svn.apache.org/viewvc?view=revision&revision=713142
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index c22ad555d2e..f8214cb4007 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2992,6 +2992,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);