* Promote [skip ci]

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

diff --git a/STATUS b/STATUS
index a2386178d93395ddb347114623fd0d608a339d8d..7a772c47f414402e972baa082383ef097f343089 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -166,22 +166,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: minfrin, jim, covener
      rpluem says: The version in the compatibility notes is wrong.
 
-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_proxy_hcheck: hcmethod now allow for HTTP/1.1 requests
      using GET11, HEAD11 and/or OPTIONS11.
      trunk revision:
@@ -225,6 +209,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1477687 ^/httpd/httpd/trunk .
      +1: rpluem, covener, jorton, gbechis
 
+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_proxy_hcheck: Honor worker timeout settings
      Trunk version of patch:
         https://svn.apache.org/r1889936