httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdono...@apache.org
Subject svn commit: r683816 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
Date Fri, 08 Aug 2008 03:14:07 GMT
Author: tdonovan
Date: Thu Aug  7 20:14:06 2008
New Revision: 683816

URL: http://svn.apache.org/viewvc?rev=683816&view=rev
Log:
Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from trunk:

* mod_rewrite: Preserve the query string when [proxy,noescape]

PR 45247

Submitted by: tdonovan
Reviewed by: rpluem, niq, tdonovan


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=683816&r1=683815&r2=683816&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Aug  7 20:14:06 2008
@@ -12,6 +12,9 @@
      known HTTP/1.0 servers. Return 'Expectation failed' (417) instead.
      [Ruediger Pluem]
 
+  *) mod_rewrite: Preserve the query string when [proxy,noescape]. PR 45247.
+     [Tom Donovan]
+
 Changes with Apache 2.2.9
 
   *) SECURITY: CVE-2008-2364 (cve.mitre.org)

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=683816&r1=683815&r2=683816&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Aug  7 20:14:06 2008
@@ -83,15 +83,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_rewrite: Preserve the query string when [proxy,noescape]. PR 45247.
-   Caused by r649840/trunk, r663593/2.2.x
-   Trunk version of patches:
-        original:    http://svn.apache.org/viewvc?view=rev&revision=670061
-        correction:  http://svn.apache.org/viewvc?view=rev&revision=670198
-   Backport version for 2.2.x of updated patch (r670061 and 670198 combined):
-        http://people.apache.org/~tdonovan/diffs/mod_rewrite_proxy_esc_2.2.x.diff
-   +1: rpluem, niq, tdonovan
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 



Mime
View raw message