From: Joe Orton <jorton@apache.org>
Date: Wed, 11 Jan 2012 14:51:17 +0000 (+0000)
Subject: Add another.
X-Git-Tag: 2.2.22~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4014bb9b24ca602d99893f0fe88d7efa6a4408bf;p=thirdparty%2Fapache%2Fhttpd.git

Add another.


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

diff --git a/STATUS b/STATUS
index 76b7d6c13d1..63d64049bc2 100644
--- a/STATUS
+++ b/STATUS
@@ -158,6 +158,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?rev=1227860&view=rev
     +1: wrowe
 
+  * Fix CVE-2012-0031, scoreboard issue.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1230065
+     2.2.x patch: use patch in 2.4.x which avoids MMN bump, 
+           http://svn.apache.org/viewvc?view=revision&revision=1230069
+     +1: jorton
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of