svn commit: r921143 - in /httpd/httpd/branches/2.0.x: STATUS server/protocol.c

[wr...@apache.org]

Author: wrowe
Date: Tue Mar  9 21:51:10 2010
New Revision: 921143

URL: http://svn.apache.org/viewvc?rev=921143&view=rev
Log:
Add CVE-2010-0434 fix for consideration

Modified:
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/server/protocol.c

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=921143&r1=921142&r2=921143&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Tue Mar  9 21:51:10 2010
@@ -121,6 +121,11 @@ RELEASE SHOWSTOPPERS:
     memory usage.
     +1: trawick, wrowe
 
+  * Commit http://people.apache.org/~wrowe/CVE-2010-0434.patch
+    SECURITY: CVE-2010-0434 (cve.mitre.org)
+    note; simpler because we had not yet cleaned up input headers for subreq
+    +1: wrowe
+
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 

Modified: httpd/httpd/branches/2.0.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/server/protocol.c?rev=921143&r1=921142&r2=921143&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.0.x/server/protocol.c Tue Mar  9 21:51:10 2010
@@ -1022,7 +1022,7 @@ AP_DECLARE(void) ap_set_sub_req_protocol
 
     rnew->status          = HTTP_OK;
 
-    rnew->headers_in      = r->headers_in;
+    rnew->headers_in      = apr_table_copy(rnew->pool, r->headers_in);
     rnew->subprocess_env  = apr_table_copy(rnew->pool, r->subprocess_env);
     rnew->headers_out     = apr_table_make(rnew->pool, 5);
     rnew->err_headers_out = apr_table_make(rnew->pool, 5);