httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r733168 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/http/http_protocol.c
Date Fri, 09 Jan 2009 22:05:00 GMT
Author: covener
Date: Fri Jan  9 14:05:00 2009
New Revision: 733168

URL: http://svn.apache.org/viewvc?rev=733168&view=rev
Log:
backport r104924:

  Fix Bug 18388 (Set-Cookie in 304)

Reviewed By: fielding, wrowe, covener


Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/http/http_protocol.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?rev=733168&r1=733167&r2=733168&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Fri Jan  9 14:05:00 2009
@@ -5,6 +5,9 @@
      mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of
      the FTP URL. Discovered by Marc Bevand of Rapid7. [Ruediger Pluem]
 
+  *) Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass 
+     through on a 304 response.  [Nick Kew]
+
 Changes with Apache 2.0.63
 
   *) winnt_mpm: Resolve modperl issues by redirecting console mode stdout

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=733168&r1=733167&r2=733168&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Fri Jan  9 14:05:00 2009
@@ -124,12 +124,6 @@
        http://people.apache.org/~fuankg/diffs/httpd-2.0.x-ap_vhost_iterate_given_conn.diff
     +1: fuankg, wrowe, pgollucci
 
-  * Backport 104924: PR 18388; Add Set-Cookie and Set-Cookie2 to the
-    list of headers allowed to pass through on a 304 response.
-    This has been in trunk since 2004, released in 2.2.0.
-      http://svn.apache.org/viewvc?view=rev&revision=104924
-    +1: fielding, wrowe, covener
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

Modified: httpd/httpd/branches/2.0.x/modules/http/http_protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/http/http_protocol.c?rev=733168&r1=733167&r2=733168&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/http/http_protocol.c (original)
+++ httpd/httpd/branches/2.0.x/modules/http/http_protocol.c Fri Jan  9 14:05:00 2009
@@ -1752,6 +1752,8 @@
                      "Warning",
                      "WWW-Authenticate",
                      "Proxy-Authenticate",
+                     "Set-Cookie",
+                     "Set-Cookie2",
                      NULL);
     }
     else {



Mime
View raw message