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 37abd0efb247b0b517f1cef36c0b65c96c7cbdec..d280afde85e8d4137392f87dfd6463562ba757ab 100644 (file)
--- 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
+