* Vote and promote [skip ci]

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

diff --git a/STATUS b/STATUS
index 64db0912596376ecd7a25b338dc232266ae4b756..585acf6dc61c2b7d2a605fd2f3ed751a0730abce 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -164,6 +164,27 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  One is a doc file in r1734835 that has already been merged and the
                  other one is 'next-number' in r1876823.
 
+  *) mod_ssl: Fix a race condition and possible crash when using a proxy client
+     certificate (SSLProxyMachineCertificateFile).
+     trunk patch: http://svn.apache.org/r1879179
+                  http://svn.apache.org/r1879180
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-gh_129.diff
+     +1: ylavic, jorton, rpluem
+
+  *) mod_proxy_http: flush spooled request body in one go to avoid
+     leaking (or long lived) temporary file. PR 64452.
+     trunk patch: http://svn.apache.org/r1878280
+     2.4.x patch: svn merge -c 1878280 ^/httpd/httpd/trunk .
+                  (modulo CHANGES conflict)
+     +1: ylavic, jorton, rpluem
+
+  *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
+     trunk patch:
+        - http://svn.apache.org/r1877829
+        - http://svn.apache.org/r1877830
+     2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .
+    +1: covener, ylavic, rpluem
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -187,20 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
-     trunk patch: 
-        - http://svn.apache.org/r1877829
-        - http://svn.apache.org/r1877830
-     2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .
-    +1: covener, ylavic
- 
-  *) mod_proxy_http: flush spooled request body in one go to avoid
-     leaking (or long lived) temporary file. PR 64452.
-     trunk patch: http://svn.apache.org/r1878280
-     2.4.x patch: svn merge -c 1878280 ^/httpd/httpd/trunk .
-                  (modulo CHANGES conflict)
-     +1: ylavic, jorton
-
   *) mod_proxy: Add ap_proxy_define_match_worker() and use it for ProxyPassMatch
      and ProxyMatch section to distinguish between normal workers and workers
      with regex substitutions in the name. Implement handling of such workers
@@ -236,13 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              register the filters, but not for adding them. IIRC filters names
              are case insentive so shouldn't matter, just popped at my eyes..
      icing: updated patch and added r1879156 to fix the eye bleed.
-  
-  *) mod_ssl: Fix a race condition and possible crash when using a proxy client
-     certificate (SSLProxyMachineCertificateFile).
-     trunk patch: http://svn.apache.org/r1879179
-                  http://svn.apache.org/r1879180
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-gh_129.diff
-     +1: ylavic, jorton
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED