From: Joe Orton <jorton@apache.org>
Date: Sun, 10 May 2009 14:42:51 +0000 (+0000)
Subject: Propose CVE-2009-1195 backport.
X-Git-Tag: 2.2.12~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ccb5e5701294f4ebf1f96d219536720d61a3286;p=thirdparty%2Fapache%2Fhttpd.git

Propose CVE-2009-1195 backport.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773345 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index a2ca75ec509..15e6f611d4f 100644
--- a/STATUS
+++ b/STATUS
@@ -167,6 +167,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?view=rev&revision=771587
    +1: wrowe
 
+ * CVE-2009-1195 security fix for Includes merging.
+   trunk version of patch:
+      http://svn.apache.org/viewvc?rev=772997&view=rev
+      http://svn.apache.org/viewvc?rev=773322&view=rev
+      http://svn.apache.org/viewvc?rev=773342&view=rev
+   2.2.x patch:
+      http://people.apache.org/~jorton/2.2.x-CVE-2009-1195.patch
+      (unmodified merge from trunk + CHANGES entry)
+   +1: jorton
 
 PATCHES/ISSUES THAT ARE STALLED