From: Joe Orton <jorton@apache.org>
Date: Fri, 2 Dec 2011 12:30:16 +0000 (+0000)
Subject: Vote, propose.
X-Git-Tag: 2.2.22~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814f23305e26e5f1b81a7f962386f78b2d139448;p=thirdparty%2Fapache%2Fhttpd.git

Vote, propose.


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

diff --git a/STATUS b/STATUS
index 642e18c2281..57c239a21e9 100644
--- a/STATUS
+++ b/STATUS
@@ -147,13 +147,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~kbrand/mod_ssl_config_defaults-2.2.x.patch
     (disabling SSLv2 in SSLProtocol is only required for 2.2.x, since trunk
      and 2.4.x no longer support this version, see r1203491 and r1203495)
-    +1: kbrand (non-binding), rjung
+    +1: kbrand (non-binding), rjung, jorton
 
   * mod_proxy_ajp: Missing support for ErrorOverride
     Trunk patch: http://svn.apache.org/viewvc?rev=1087864&view=rev
 	2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=27976
 	+1: igalic
 
+  * mod_rewrite, mod_proxy: Fix CVE-2011-4317
+      Trunk patch: http://svn.apache.org/viewvc?rev=1209432&view=rev
+      2.2.x patch: trunk patch works
+    +1: jorton
 
 PATCHES/ISSUES THAT ARE STALLED