Promote

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

diff --git a/STATUS b/STATUS
index 9bae3cb2ad4b2b382d1e8b8527aa3ea37fa94e74..085e5a7a4341fa9e1c6fed2aac1b180e74de1353 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,30 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * core:  Don't send spurious "100 Continue" response lines.
+      PR 38014
+      http://svn.apache.org/viewvc?view=rev&revision=574240
+      +1: niq, rpluem, jim
+
+    * mod_proxy_ftp: Don't segfault on bad line in FTP listing
+      PR 40733
+      http://svn.apache.org/viewvc?view=rev&revision=574100
+      +1: niq, rpluem, jim
+
+    * mod_proxy: escape error-notes correctly
+      PR 40952
+      http://svn.apache.org/viewvc?view=rev&revision=573939
+      +1: niq, rpluem, jim
+
+    * mod_proxy: check ProxyBlock for all blocked addresses
+      PR 36987
+      http://svn.apache.org/viewvc?view=rev&revision=573911
+      +1: niq, rpluem, jim
+
+    * mod_proxy: Don't lose bytes when a response line arrives in small chunks.
+      PR 40894
+      http://svn.apache.org/viewvc?view=rev&revision=573903
+      +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -152,16 +176,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           Trunk works.
       +1: rpluem, jim
 
-    * core:  Don't send spurious "100 Continue" response lines.
-      PR 38014
-      http://svn.apache.org/viewvc?view=rev&revision=574240
-      +1: niq, rpluem, jim
-
-    * mod_proxy_ftp: Don't segfault on bad line in FTP listing
-      PR 40733
-      http://svn.apache.org/viewvc?view=rev&revision=574100
-      +1: niq, rpluem, jim
-
     * mod_proxy_http: Propagate Proxy-Authorization header correctly.
       PR 25947
       http://svn.apache.org/viewvc?view=rev&revision=574021
@@ -169,21 +183,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       rpluem says: +1 in general, but please remove the tabs from your
       patch and in trunk.
 
-    * mod_proxy: escape error-notes correctly
-      PR 40952
-      http://svn.apache.org/viewvc?view=rev&revision=573939
-      +1: niq, rpluem, jim
-
-    * mod_proxy: check ProxyBlock for all blocked addresses
-      PR 36987
-      http://svn.apache.org/viewvc?view=rev&revision=573911
-      +1: niq, rpluem, jim
-
-    * mod_proxy: Don't lose bytes when a response line arrives in small chunks.
-      PR 40894
-      http://svn.apache.org/viewvc?view=rev&revision=573903
-      +1: niq, rpluem, jim
-
     * mod_rewrite: Add option to suppress URL unescaping
       PR 34602
       http://svn.apache.org/viewvc?view=rev&revision=573831