Update, vote, promote. [skip ci]

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

diff --git a/STATUS b/STATUS
index 23d861cb14290c3b88367cacf393e5eaa9b42557..24ca39744e7397ef31d2e8ac75f2f6c60b97695e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: Make writing the pidfile atomic to avoid startup failures
+     after (e.g.) system crashes, but also races with multiple
+     concurrent "httpd -k restart" runs which have a race between
+     reading and writing a fresh pidfile.
+     trunk patch: https://svn.apache.org/r1875153
+                  https://svn.apache.org/r1875240
+                  https://svn.apache.org/r1877645
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/163.patch
+     +1: jorton, covener, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -273,12 +283,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://svn.apache.org/r1879401
                   https://svn.apache.org/r1879402
                   https://svn.apache.org/r1880200
-     2.4.x patch: http://people.apache.org/~ylavic/patches/2.4.x-mod_proxy_http-upgrade-4on5.patch
+                  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 changes to mod_proxy_wstunnel have been dropped for this
-             backport proposal, the goal being to handle tunneling/upgrade in
-             mod_proxy_http from now (replacing/obsoleting wstunnel).
+     +1: ylavic,
+     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).
+     ylavic: +1 from covener dropped after adding r1885239, r1885240 and
+             r1885244 in v2.
 
   *) mod_proxy: common spooling code to allow mod_proxy_fgci proxy-sendcl. BZ 57087 
      trunk patch: https://svn.apache.org/r1884067
@@ -294,16 +312,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              to SetEnv proxy-sendcl for that (2.4 compat).
   [ End of series ]
 
-  *) core: Make writing the pidfile atomic to avoid startup failures
-     after (e.g.) system crashes, but also races with multiple
-     concurrent "httpd -k restart" runs which have a race between
-     reading and writing a fresh pidfile.
-     trunk patch: https://svn.apache.org/r1875153
-                  https://svn.apache.org/r1875240
-                  https://svn.apache.org/r1877645
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/163.patch
-     +1: jorton, covener            
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]