From: Bradley Nicholes <bnicholes@apache.org>
Date: Fri, 17 Mar 2006 19:34:22 +0000 (+0000)
Subject: mod_ldap backport
X-Git-Tag: 2.2.1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b79de54c0314039a97df7226cc94801ebec87284;p=thirdparty%2Fapache%2Fhttpd.git

mod_ldap backport

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

diff --git a/STATUS b/STATUS
index 37abd0efb24..d280afde85e 100644
--- a/STATUS
+++ b/STATUS
@@ -212,3 +212,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs?rev=384731&view=rev
       +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
+      +1: bnicholes
+