backport mod_ldap shared memory lock fix

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

diff --git a/CHANGES b/CHANGES
index bd178f3a240a53247a6aa3d4e55d68000810a1f4..7eb85f76bf7b86078967777870ee1d0e77e7a67b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_ldap: Avoid possible crashes, hangs, and busy loops due to
+     improper merging of the cache lock in vhost config
+     PR 43164 [Eric Covener]
 
 Changes with Apache 2.2.5
 

diff --git a/STATUS b/STATUS
index 9ae0a4b09703ecbcf7e610a503f4d574f227a3c6..31e249ae89b57f28474beb07ebf2475708dcb645 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -78,11 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_ldap: Copy cache lock into per-server config
-      http://svn.apache.org/viewvc?view=rev&revision=567091
-      +1: covener, trawick (iff CHANGES is modified to mention the 
-          severe problem symptoms caused by not grabbing mutex)
-      rpluem says: Dito to trawick: +1 iff CHANGES is modified accordingly.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 9783a77b83ee14519ad63b115e0d7ea0357b7910..d6f8c78bc10a8153666864ca46c321fd73f96e4e 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -1823,6 +1823,7 @@ static void *util_ldap_merge_config(apr_pool_t *p, void *basev,
     st->search_cache_size = base->search_cache_size;
     st->compare_cache_ttl = base->compare_cache_ttl;
     st->compare_cache_size = base->compare_cache_size;
+    st->util_ldap_cache_lock = base->util_ldap_cache_lock; 
 
     st->connections = NULL;
     st->ssl_supported = 0;