AuthLDAPBindAuthoritative backport developed conflicts, resolve and supply patches

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

diff --git a/STATUS b/STATUS
index 12b1fdce5cb4bb87dc037c4bc8a04cc26932b50c..85ab095250058cb0ae093c6435cc4080495bec7e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -127,12 +127,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      verify their password. PR46608.
      Trunk patch: http://svn.apache.org/viewvc?rev=881808&view=rev
              doc: http://svn.apache.org/viewvc?view=revision&revision=881812
-     2.2.x patch: trunk works.
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative.diff 
+     2.2.x doc  : http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative-doc.diff
+                  (resolves loglevel conflict introduced after the trunk commit)
     +1: covener, pgollucci
     rpluem says: I am +1 once you provide proper documentation for the manual
     covener says: doc revision added above
     minfrin says: The trunk patches no longer apply clean, is it possible to
                   create a v2.2. patch?
+    covener: resolved conflict 
 
   * mod_reqtimeout: New module to limit time waiting for requests from clients.
     Backport current version from trunk.