vote promote change

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

diff --git a/STATUS b/STATUS
index ae7d6153d9ea39f1e6cc69527f2e128d40f7db97..68a23f228003ede25c4f8c8a92f662f4f70cb8d2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -121,9 +121,40 @@ RELEASE SHOWSTOPPERS:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, jim
 
+  *) PR 60576: 2.4.21 broke PHP-FPM with the patch to strip the bogus "proxy://"
+     prefix from SCRIPT_FILENAME. We need to revert to the previous behavior
+     ASAP to avoid any further hurdles with FCGI implementations while we figure
+     this out.
+     trunk patch: http://svn.apache.org/r1780328
+                  http://svn.apache.org/r1780329
+                  http://svn.apache.org/r1781329
+                  http://svn.apache.org/r1782164
+                  http://svn.apache.org/r1782166
+                  http://svn.apache.org/r1782193
+                  http://svn.apache.org/r1778350
+                  http://svn.apache.org/r1781329
+                  http://svn.apache.org/r1782194
+                  http://svn.apache.org/r1782323
+                  http://svn.apache.org/r1782418
+                  http://svn.apache.org/r1782419
+                  http://svn.apache.org/r1782482
+                  http://svn.apache.org/r1782532
+     2.4.x patch: http://home.apache.org/~jim/patches/mod_proxy_fcgi-v3.patch
+     +1: jim
+
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) event: close a race condition where we might re-enable listeners while they
+     are already or about to be closed.
+     trunk patch: http://svn.apache.org/r1774541
+     2.4.x patch: trunk works
+     +1: ylavic, jim, wrowe
+
+  *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout.
+     trunk patch: http://svn.apache.org/r1775858
+     2.4 patch: trunk works (modulo CHANGES)
+     +1: elukey, jim, wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -142,17 +173,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v3.patch
      +1: ylavic
 
-  *) event: close a race condition where we might re-enable listeners while they
-     are already or about to be closed.
-     trunk patch: http://svn.apache.org/r1774541
-     2.4.x patch: trunk works
-     +1: ylavic, jim, wrowe
-
-  *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout.
-     trunk patch: http://svn.apache.org/r1775858
-     2.4 patch: trunk works (modulo CHANGES)
-     +1: elukey, jim, wrowe
-
   *) mod_ssl: work around leaks on (graceful) restart.
      trunk patch: http://svn.apache.org/r1781187
                   http://svn.apache.org/r1781190
@@ -166,27 +186,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
      +1: ylavic, jim
 
-  *) PR 60576: 2.4.21 broke PHP-FPM with the patch to strip the bogus "proxy://"
-     prefix from SCRIPT_FILENAME. We need to revert to the previous behavior
-     ASAP to avoid any further hurdles with FCGI implementations while we figure
-     this out.
-     trunk patch: http://svn.apache.org/r1780328
-                  http://svn.apache.org/r1780329
-                  http://svn.apache.org/r1781329
-                  http://svn.apache.org/r1782164
-                  http://svn.apache.org/r1782166
-                  http://svn.apache.org/r1782193
-                  http://svn.apache.org/r1778350
-                  http://svn.apache.org/r1781329
-                  http://svn.apache.org/r1782194
-                  http://svn.apache.org/r1782323
-                  http://svn.apache.org/r1782418
-                  http://svn.apache.org/r1782419
-                  http://svn.apache.org/r1782482
-                  http://svn.apache.org/r1782532
-     2.4.x patch: http://home.apache.org/~jim/patches/mod_proxy_fcgi-v3.patch
-     +1: jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]