promote

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

diff --git a/STATUS b/STATUS
index b51dcab693193bc24ffb799b0137aa890b0d553e..9e61de43c639b1446d4ee07df51d8738a54f33cd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -149,32 +149,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 ]
-
-  *) Add the ldap-search option to mod_authnz_ldap, allowing authorization
-     to be based on arbitrary expressions that do not include the username.
-     Make sure that when ldap searches are too long, we explicitly log the
-     error.
-     Trunk version of patch:
-        https://svn.apache.org/r1589993
-        https://svn.apache.org/r1591012
-        https://svn.apache.org/r1596108
-     Backport version for 2.4.x of patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-search.patch
-     +1: minfrin, jim,
-     jailletc36: r1745033 seems related and should in included
-
-  *) mod_authn_core: Add expression support to AuthName and AuthType.
-     Trunk version of patch:
-        https://svn.apache.org/r1663123
-        https://svn.apache.org/r1670431
-     Backport version for 2.4.x of patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
-     +1: minfrin, jim,
-     rpluem says: The version in the compatibility notes is wrong.
-
   *) Easy patches: synch 2.4.x and trunk
          - Makefile.in (build/config_vars.out): Rebuild if build/config_vars.sh has changed
          - suexec: sort the 'safe_env_lst' array
@@ -213,6 +187,32 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1902117,1902130,1902132,1902133 ^/httpd/httpd/trunk .
      +1: rjung, rpluem, jim
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+  *) Add the ldap-search option to mod_authnz_ldap, allowing authorization
+     to be based on arbitrary expressions that do not include the username.
+     Make sure that when ldap searches are too long, we explicitly log the
+     error.
+     Trunk version of patch:
+        https://svn.apache.org/r1589993
+        https://svn.apache.org/r1591012
+        https://svn.apache.org/r1596108
+     Backport version for 2.4.x of patch:
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-search.patch
+     +1: minfrin, jim,
+     jailletc36: r1745033 seems related and should in included
+
+  *) mod_authn_core: Add expression support to AuthName and AuthType.
+     Trunk version of patch:
+        https://svn.apache.org/r1663123
+        https://svn.apache.org/r1670431
+     Backport version for 2.4.x of patch:
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
+     +1: minfrin, jim,
+     rpluem says: The version in the compatibility notes is wrong.
+
   *) mod_ssl: fix for PR66190.
      trunk revision:
         https://svn.apache.org/r1903167