svn commit: r915407 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_negotiation.c

[ni...@apache.org]

Author: niq
Date: Tue Feb 23 16:16:04 2010
New Revision: 915407

URL: http://svn.apache.org/viewvc?rev=915407&view=rev
Log:
mod_negotiation: Preserve query string over multiviews negotiation.
PR 33112
Joergen Thomsen

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_negotiation.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=915407&r1=915406&r2=915407&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Feb 23 16:16:04 2010
@@ -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]
 

Modified: httpd/httpd/trunk/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_negotiation.c?rev=915407&r1=915406&r2=915407&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_negotiation.c Tue Feb 23 16:16:04 2010
@@ -3129,6 +3129,9 @@
             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);