httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r917017 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/mappers/mod_negotiation.c
Date Sat, 27 Feb 2010 19:06:32 GMT
Author: minfrin
Date: Sat Feb 27 19:06:31 2010
New Revision: 917017

URL: http://svn.apache.org/viewvc?rev=917017&view=rev
Log:
mod_negotiation: Do not lose query string after content negotiation
+1: rpluem, jorton, trawick

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

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=917017&r1=917016&r2=917017&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Feb 27 19:06:31 2010
@@ -9,6 +9,11 @@
      access control is still vulnerable, unless using OpenSSL >= 0.9.8l.
      [Joe Orton, Ruediger Pluem, Hartmut Keil <Hartmut.Keil adnovum.ch>]
 
+  *) 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_cache: Introduce the thundering herd lock, a mechanism to keep
      the flood of requests at bay that strike a backend webserver as
      a cached entity goes stale. [Graham Leggett]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=917017&r1=917016&r2=917017&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Feb 27 19:06:31 2010
@@ -96,12 +96,6 @@
     minfrin: The trunk patch currently conflicts with v2.2, is someone able
     to take a look?
 
-  * mod_negotiation: Do not loose query string after content negotiation
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=915407&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jorton, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c?rev=917017&r1=917016&r2=917017&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c Sat Feb 27 19:06:31 2010
@@ -3130,6 +3130,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);



Mime
View raw message