← Back to branch summary

~ubuntu-branches/ubuntu/dapper/apache2/dapper-proposed

« back to all changes in this revision

Viewing changes to debian/patches/118_CVE-2010-0434.patch

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-03-08 14:33:49 UTC
  • Revision ID: james.westby@ubuntu.com-20100308143349-nrcqeno6vv93h6f1
Tags: 2.0.55-4ubuntu2.10
* SECURITY UPDATE: information disclosure via improper handling of
  headers in subrequests
  - debian/patches/118_CVE-2010-0434.dpatch: use a copy of r->headers_in
    in server/protocol.c.
  - CVE-2010-0434

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/118_CVE-2010-0434.patch
 
1
# Description: fix information disclosure via improper handling of
 
2
#  headers in subrequests
 
3
# Origin: backport, http://svn.apache.org/viewvc?view=revision&revision=917867
 
4
# Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=48359
 
5
 
 
6
diff -Naur build-tree.orig/apache2/server/protocol.c build-tree/apache2/server/protocol.c
 
7
--- build-tree.orig/apache2/server/protocol.c   2010-03-08 14:15:31.000000000 -0500
 
8
+++ build-tree/apache2/server/protocol.c        2010-03-08 14:32:09.000000000 -0500
 
9
@@ -1014,7 +1014,7 @@
 
10
 
 
11
     rnew->status          = HTTP_OK;
 
12
 
 
13
-    rnew->headers_in      = r->headers_in;
 
14
+    rnew->headers_in      = apr_table_copy(rnew->pool, r->headers_in);
 
15
     rnew->subprocess_env  = apr_table_copy(rnew->pool, r->subprocess_env);
 
16
     rnew->headers_out     = apr_table_make(rnew->pool, 5);
 
17
     rnew->err_headers_out = apr_table_make(rnew->pool, 5);