httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1004972 - in /httpd/httpd/branches/2.0.x: STATUS modules/mappers/mod_negotiation.c
Date Wed, 06 Oct 2010 10:30:11 GMT
Author: fuankg
Date: Wed Oct  6 10:30:11 2010
New Revision: 1004972

URL: http://svn.apache.org/viewvc?rev=1004972&view=rev
Log:
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.

Modified:
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=1004972&r1=1004971&r2=1004972&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Oct  6 10:30:11 2010
@@ -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

Modified: httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c?rev=1004972&r1=1004971&r2=1004972&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c Wed Oct  6 10:30:11 2010
@@ -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);



Mime
View raw message