From: Stefan Fritsch <sf@apache.org>
Date: Sat, 1 Oct 2011 16:06:09 +0000 (+0000)
Subject: vote, promote
X-Git-Tag: 2.2.22~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af6bbb7a3f1ad006594b5e3187c4dff5daa90c8;p=thirdparty%2Fapache%2Fhttpd.git

vote, promote


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

diff --git a/STATUS b/STATUS
index 7d3b0e37f86..a343c3162f8 100644
--- a/STATUS
+++ b/STATUS
@@ -94,6 +94,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_substitute: buffer alloc off by two
+    Trunk patch: Code not present.
+    2.2.x patch: http://people.apache.org/~rjung/patches/substitute-off-by-two-2.2.patch
+    +1: rjung, rpluem, sf
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -161,17 +166,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     that fix the check for the timeout status?
     jfclere: Ooops see above.
 
-  * mod_substitute: buffer alloc off by two
-    Trunk patch: Code not present.
-    2.2.x patch: http://people.apache.org/~rjung/patches/substitute-off-by-two-2.2.patch
-    +1: rjung, rpluem
-
   * mod_ssl: Update default config (SSLCipherSuite, SSLHonorCipherOrder, MSIE pattern)
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=966160
                  http://svn.apache.org/viewvc?view=revision&revision=1132793
                  http://svn.apache.org/viewvc?view=revision&revision=1135234
     2.2.x patch: http://people.apache.org/~rjung/patches/default-sslciphersuite_and_sslhonorciphers_2.2.patch
-    +1: rjung
+    +1: rjung, sf
 
 PATCHES/ISSUES THAT ARE STALLED