From: Jim Jagielski <jim@apache.org>
Date: Sun, 20 Sep 2009 17:47:15 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.14~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5970bcc6be1b5e3ed79fc2f118222e82747683b8;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 648aa04e99b..9384942614c 100644
--- a/STATUS
+++ b/STATUS
@@ -89,6 +89,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_ldap: Pre-scan the requirements array before doing any LDAP lookups,
+   for cases where an LDAP URL is configured but non-LDAP authn/authz is in 
+   effect. This stops us from trying to resolve file-based userids to a DN
+   when the AuthLDAPURL has been defined at a very high level.
+   PR 45946
+   Trunk patch: n/a due to authz refactoring (no provider called without require-ments)
+   2.2.x version of patch: http://people.apache.org/~covener/httpd-2.2.x-authnz_ldap-skipdnloookup-3.diff
+   +1: covener, minfrin, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -108,15 +118,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x Patch: http://people.apache.org/~minfrin/ssl-env.diff
    +1: minfrin
 
- * mod_ldap: Pre-scan the requirements array before doing any LDAP lookups,
-   for cases where an LDAP URL is configured but non-LDAP authn/authz is in 
-   effect. This stops us from trying to resolve file-based userids to a DN
-   when the AuthLDAPURL has been defined at a very high level.
-   PR 45946
-   Trunk patch: n/a due to authz refactoring (no provider called without require-ments)
-   2.2.x version of patch: http://people.apache.org/~covener/httpd-2.2.x-authnz_ldap-skipdnloookup-3.diff
-   +1: covener, minfrin, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre