]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
One backported, propose
authorStefan Fritsch <sf@apache.org>
Tue, 3 Jan 2012 21:37:08 +0000 (21:37 +0000)
committerStefan Fritsch <sf@apache.org>
Tue, 3 Jan 2012 21:37:08 +0000 (21:37 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1226956 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 035b15c19bbb620064f51c1e59893ab2c475779a..aa2136416d776594cb95ba1df4ab7ba27ca1983c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -107,11 +107,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      and 2.4.x no longer support this version, see r1203491 and r1203495)
     +1: kbrand (non-binding), rjung, jorton
 
-  * core: Fix segfault in ap_send_interim_response(). PR 52315
-      Trunk patch: http://svn.apache.org/viewvc?rev=895483&view=rev
-      2.2.x patch: trunk patch works
-    +1: sf, trawick, minfrin
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -169,6 +164,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.2.x patch: trunk patch works
     +1: sf
 
+  * core: Fix integer overflow in ap_pregsub. CVE-2011-3607
+      Trunk patch: http://svn.apache.org/viewvc?rev=1198940&view=rev
+      2.2.x patch: http://people.apache.org/~sf/CVE-2011-3607.diff
+    +1: sf
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of