You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by co...@apache.org on 2010/02/14 20:24:26 UTC

svn commit: r910063 - /httpd/httpd/branches/2.2.x/STATUS

Author: covener
Date: Sun Feb 14 19:24:26 2010
New Revision: 910063

URL: http://svn.apache.org/viewvc?rev=910063&view=rev
Log:
AuthLDAPBindAuthoritative backport developed conflicts, resolve and supply patches


Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=910063&r1=910062&r2=910063&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Feb 14 19:24:26 2010
@@ -127,12 +127,15 @@
      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.