From: Eric Covener Date: Fri, 17 Aug 2007 17:33:11 +0000 (+0000) Subject: AFAICT, LDAP_CACHE_LOCK was a no-op when virtualhosts were used X-Git-Tag: 2.3.0~1600 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad8cfa73008d124197ae88c9968363cc2dbd980b;p=apache AFAICT, LDAP_CACHE_LOCK was a no-op when virtualhosts were used git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@567091 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index e17c0db92f..8ad9ec1b64 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.3.0 + *) mod_ldap: Copy cache lock into per-server config + [Eric Covener] + *) mod_negotiation: preserve Query String in resolving a type map PR 33112 [Jørgen Thomsen , Nick Kew] diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index 1dfc71f5f1..98e5ce1690 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -2111,6 +2111,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;