From: Eric Covener <covener@apache.org>
Date: Tue, 12 May 2009 13:13:31 +0000 (+0000)
Subject: vote & promote CVE-2009-1195
X-Git-Tag: 2.2.12~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbadf85c0d113456c0c3a862f65a39c578bd37d3;p=thirdparty%2Fapache%2Fhttpd.git

vote & promote CVE-2009-1195


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

diff --git a/STATUS b/STATUS
index 26c76dc5ab8..d35ae82ea1c 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * 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, rpluem, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -142,15 +151,6 @@ 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, rpluem
 
 PATCHES/ISSUES THAT ARE STALLED