Vote, promote.

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

diff --git a/STATUS b/STATUS
index 64e5943005a24cd9cff51b3b36b88a5f2b5579cf..a028b48e262c2fdd346774cafa3a99bb8c25c822 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,6 +112,33 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Synch 2.4.x with trunk, Strip useless apr_brigade_cleanup() calls.
+     trunk patch: http://svn.apache.org/r1601624
+     2.4.x patch: trunk patch works
+     +1: jailletc36, jim, ylavic
+
+  *) Use ap_array_str_contains to simplify code
+     trunk patch: http://svn.apache.org/r1733523
+                  http://svn.apache.org/r1733691
+     2.4.x patch: trunk patch works
+     +1: jailletc36, jim, ylavic
+
+  *) mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()
+     hook returns an error.
+     trunk patch: http://svn.apache.org/r1734006
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: minfrin, jim, ylavic
+
+  *) mod_rewrite: PR58854: Revert r1726016 (rewrite looping issue) which was
+     reverted in trunk in r1732896. The fix is bad and breaks old loop
+     avoidance.
+     +1 covener, jim, ylavic
+
+  *) mod_rewrite: Add QSL flag as a way to allow rewrites to files with question
+                  marks in their names. PR58777
+     trunk patch: http://svn.apache.org/r1734125
+     2.4.x patch: trunk works (modulo CHANGES and compat in docs)
+     +1 covener, jim, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -153,17 +180,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-exit_with_error_on_mpm_failure.patch
      +1: ylavic, jim
 
-  *) Synch 2.4.x with trunk, Strip useless apr_brigade_cleanup() calls.
-     trunk patch: http://svn.apache.org/r1601624
-     2.4.x patch: trunk patch works
-     +1: jailletc36, jim
-
-  *) Use ap_array_str_contains to simplify code
-     trunk patch: http://svn.apache.org/r1733523
-                  http://svn.apache.org/r1733691
-     2.4.x patch: trunk patch works
-     +1: jailletc36, jim
-
   *) core/util_script: relax alphanumeric filter of enviroment variable names
           on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
           unadulterated in 64 bit versions of Windows. PR 46751.
@@ -171,23 +187,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: jailletc36
 
-  *) mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()
-     hook returns an error.
-     trunk patch: http://svn.apache.org/r1734006
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: minfrin, jim
-
-  *) mod_rewrite: PR58854: Revert r1726016 (rewrite looping issue) which was
-     reverted in trunk in r1732896. The fix is bad and breaks old loop
-     avoidance.
-     +1 covener, jim
-
-  *) mod_rewrite: Add QSL flag as a way to allow rewrites to files with question
-                  marks in their names. PR58777
-     trunk patch: http://svn.apache.org/r1734125
-     2.4.x patch: trunk works (modulo CHANGES and compat in docs)
-     +1 covener, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
 
@@ -232,6 +231,7 @@ PATCHES/ISSUES THAT ARE BEING WORKED
              make it nonblocking (by default)?
         jim: Non-blocking seems the best way to handle...
 
+
 PATCHES/ISSUES THAT ARE STALLED
 
    * core: Add ap_errorlog_provider to make ErrorLog logging modular. This