Vote followed by a promote.

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

diff --git a/STATUS b/STATUS
index ccabf88d097f84a6a9598d4f4a2a1005072ee6bd..10f31a8a363285eb9296f0e712d5eaf988f05218 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,34 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy_http: handle upgrade/tunneling protocols. BZ 61616 is about
+                     mod_proxy_connect but there has been wstunnel reports
+                     on dev@ about that too lately.
+     trunk patch: https://svn.apache.org/r1678771
+                  https://svn.apache.org/r1832348
+                  https://svn.apache.org/r1869338
+                  https://svn.apache.org/r1869420
+                  https://svn.apache.org/r1878367
+                  https://svn.apache.org/r1877557
+                  https://svn.apache.org/r1877558
+                  https://svn.apache.org/r1877646
+                  https://svn.apache.org/r1877695
+                  https://svn.apache.org/r1879401
+                  https://svn.apache.org/r1879402
+                  https://svn.apache.org/r1880200
+                  https://svn.apache.org/r1885239
+                  https://svn.apache.org/r1885240
+                  https://svn.apache.org/r1885244
+     2.4.x patch: http://people.apache.org/~ylavic/patches/2.4.x-mod_proxy_http-upgrade-4on5-v2.patch
+                  https://github.com/apache/httpd/pull/158
+     +1: ylavic, covener, minfrin
+     ylavic: All the corresponding trunk changes to mod_proxy_wstunnel (but
+             r1885239) have been dropped for this backport proposal, the goal
+             being to handle upgrade in mod_proxy_http from now, while r1885239
+             allows to benefit from the Upgrade improvements done in proxy_http
+             with existing wstunnel configurations (provided mod_proxy_http
+             module is loaded).
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -207,34 +235,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jailletc36, minfrin
 
   [ start of series (staged/cumulative patches) ]
-  *) mod_proxy_http: handle upgrade/tunneling protocols. BZ 61616 is about
-                     mod_proxy_connect but there has been wstunnel reports
-                     on dev@ about that too lately.
-     trunk patch: https://svn.apache.org/r1678771
-                  https://svn.apache.org/r1832348
-                  https://svn.apache.org/r1869338
-                  https://svn.apache.org/r1869420
-                  https://svn.apache.org/r1878367
-                  https://svn.apache.org/r1877557
-                  https://svn.apache.org/r1877558
-                  https://svn.apache.org/r1877646
-                  https://svn.apache.org/r1877695
-                  https://svn.apache.org/r1879401
-                  https://svn.apache.org/r1879402
-                  https://svn.apache.org/r1880200
-                  https://svn.apache.org/r1885239
-                  https://svn.apache.org/r1885240
-                  https://svn.apache.org/r1885244
-     2.4.x patch: http://people.apache.org/~ylavic/patches/2.4.x-mod_proxy_http-upgrade-4on5-v2.patch
-                  https://github.com/apache/httpd/pull/158
-     +1: ylavic, covener
-     ylavic: All the corresponding trunk changes to mod_proxy_wstunnel (but
-             r1885239) have been dropped for this backport proposal, the goal
-             being to handle upgrade in mod_proxy_http from now, while r1885239
-             allows to benefit from the Upgrade improvements done in proxy_http
-             with existing wstunnel configurations (provided mod_proxy_http
-             module is loaded).
-
   *) mod_proxy: common spooling code to allow mod_proxy_fgci proxy-sendcl. BZ 57087 
      trunk patch: https://svn.apache.org/r1884067
                   https://svn.apache.org/r1884068