Vote, promote.

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

diff --git a/STATUS b/STATUS
index f465b313a4a2ae465d7b1e60ead5d30884ab364f..c8227034da1e86072b0439b11e3d11ee53b01d15 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,30 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) core: Save 160 bytes in the request pool and some cycles if no <If>
+            directive is used.
+      trunk patch: http://svn.apache.org/r1735906
+      2.4.x patch: svn merge -c 1735906 ^/httpd/httpd/trunk .
+      +1: jailletc36, jim, ylavic
+
+   *) Easy proposals:
+      - mod_authnz_ldap: Log a warning when the LDAP authn provider is configured
+                         but an AuthLDAPURL isn't
+      - mod_auth_digest: Follow up to r1772919: update APLOGNO()
+      - mod_cache_socache: Save a few cycles
+      - mod_cache_socache: Improve indentation
+      - mod_cache_socache: Group bit field values in order to save some memory
+      - mod_authnz_ldap: Add an explicit NULL to initialise a field in an authn_provider
+                         structure
+      trunk patch: http://svn.apache.org/r1551611
+                   http://svn.apache.org/r1783765
+                   http://svn.apache.org/r1788996
+                   http://svn.apache.org/r1788998
+                   http://svn.apache.org/r1789000
+                   http://svn.apache.org/r1795651
+      2.4.x patch: svn merge -c 1551611,1783765,1788996,1788998,1789000,1795651 ^/httpd/httpd/trunk .
+      +1: jailletc36, jim, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -194,30 +218,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 If confirmed, it would worth, IMHO, a CHANGE entry and maybe a
                 2.2.x backport.
 
-   *) core: Save 160 bytes in the request pool and some cycles if no <If>
-            directive is used.
-      trunk patch: http://svn.apache.org/r1735906
-      2.4.x patch: svn merge -c 1735906 ^/httpd/httpd/trunk .
-      +1: jailletc36, jim
-
-   *) Easy proposals:
-      - mod_authnz_ldap: Log a warning when the LDAP authn provider is configured
-                         but an AuthLDAPURL isn't
-      - mod_auth_digest: Follow up to r1772919: update APLOGNO()
-      - mod_cache_socache: Save a few cycles
-      - mod_cache_socache: Improve indentation
-      - mod_cache_socache: Group bit field values in order to save some memory
-      - mod_authnz_ldap: Add an explicit NULL to initialise a field in an authn_provider
-                         structure
-      trunk patch: http://svn.apache.org/r1551611
-                   http://svn.apache.org/r1783765
-                   http://svn.apache.org/r1788996
-                   http://svn.apache.org/r1788998
-                   http://svn.apache.org/r1789000
-                   http://svn.apache.org/r1795651
-      2.4.x patch: svn merge -c 1551611,1783765,1788996,1788998,1789000,1795651 ^/httpd/httpd/trunk .
-      +1: jailletc36, jim
-
    *) Restore single-char field names inadvertantly disallowed in 2.4.25.
       Message ID: <CAKQ1sVPrHx911sBDp3-BDsqS=qsQ4Eap0zjSz42j_vuZV2si_g@mail.gmail.com>
       Backports: r1800173