vote+promote

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

diff --git a/STATUS b/STATUS
index 2ce8bf7141c051e3885d4a94efe0fb05c0c83c63..021b9ceda3a56719113d6ccc5ce78ba9a1d0d2c2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,23 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
  
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
-
-
-  * mod_auth_basic: Add a generic mechanism to fake basic authentication
-    using the ap_expr parser. This allows the administrator to construct
-    their own username and password for basic authentication based on their
-    needs. Alternative fix for PR52616.
-    trunk patch: http://svn.apache.org/r1457471
-                 http://svn.apache.org/r1457504
-                 http://svn.apache.org/r1462266
-                 http://svn.apache.org/r1468581
-    2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_auth_basic-fake4.patch
-    +1: minfrin, jim
-
   * mod_proxy_wstunnel: Backport (copy) websocket tunnel proxy submodule
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1452911
                  http://svn.apache.org/viewvc?view=revision&revision=1452949
@@ -126,6 +109,29 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     gsmith: Windows will need these as well, then +1
             http://people.apache.org/~gsmith/httpd/diffs/wstunnel_winbits.diff
 
+    * rotatelogs: support -n number-of-files for circular set of filenames
+      trunk patch: http://svn.apache.org/r1490493
+                   http://svn.apache.org/r1490761
+      2.4.x patch: trunk works + compat for manual
+      +1 covener, minfrin, jim
+      
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+
+
+  * mod_auth_basic: Add a generic mechanism to fake basic authentication
+    using the ap_expr parser. This allows the administrator to construct
+    their own username and password for basic authentication based on their
+    needs. Alternative fix for PR52616.
+    trunk patch: http://svn.apache.org/r1457471
+                 http://svn.apache.org/r1457504
+                 http://svn.apache.org/r1462266
+                 http://svn.apache.org/r1468581
+    2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_auth_basic-fake4.patch
+    +1: minfrin, jim
+
     * skiplist: Add skiplist functionality
       trunk patches: https://svn.apache.org/r1411190
                      https://svn.apache.org/r1411274
@@ -190,12 +196,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works modulo CHANGES
       +1: minfrin, jim
 
-    * rotatelogs: support -n number-of-files for circular set of filenames
-      trunk patch: http://svn.apache.org/r1490493
-                   http://svn.apache.org/r1490761
-      2.4.x patch: trunk works + compat for manual
-      +1 covener, minfrin
-      
     * core: Allow strtoul
       trunk patch: http://svn.apache.org/r1491155
       2.4.x patch: trunk patch works