From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 22 Mar 2006 00:21:05 +0000 (+0000)
Subject: Reset the vote on the util_ldap.c backport proposal due to changes in the patch after... 
X-Git-Tag: 2.2.1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4631e92839f7f3688638f8b87c78e80df1629970;p=thirdparty%2Fapache%2Fhttpd.git

Reset the vote on the util_ldap.c backport proposal due to changes in the patch after some discussion on the dev-list.

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

diff --git a/STATUS b/STATUS
index e913de51fca..ab43d54720e 100644
--- a/STATUS
+++ b/STATUS
@@ -213,13 +213,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: wrowe, pquerna
 
     * mod_ldap: Fix a race condition when creating the connection pool mutex
-	and also clean up the server_merge function to allow the overwritible
-	settings to be set within a vhost.
-         http://svn.apache.org/viewcvs.cgi?view=rev&rev=386477
-	 http://svn.apache.org/viewcvs.cgi?view=rev&rev=386698
+	and make sure that memory is being allocated from the correct pools
+	when connections are being established. Enforce the GLOBAL_ONLY 
+	parameter for all of the directives.
+         http://people.apache.org/~bnicholes/util_ldap.c.patch
       +1: bnicholes
-         the two commits above plus this to get the contexts right:
-         http://svn.apache.org/viewcvs?rev=386751&view=rev
-      +1: trawick
-      trawick says: This needs a CHANGES entry by the time it gets merged
-                    to 2.2. 
+