Blame SOURCES/httpd-2.4.6-r1824872.patch
|
 |
008793 |
--- a/modules/ldap/util_ldap.c 2018/02/20 13:00:39 1824871
|
|
|
008793 |
+++ b/modules/ldap/util_ldap.c 2018/02/20 13:02:54 1824872
|
|
|
008793 |
@@ -2858,7 +2858,6 @@
|
|
|
008793 |
st->search_cache_size = base->search_cache_size;
|
|
|
008793 |
st->compare_cache_ttl = base->compare_cache_ttl;
|
|
|
008793 |
st->compare_cache_size = base->compare_cache_size;
|
|
|
008793 |
- st->util_ldap_cache_lock = base->util_ldap_cache_lock;
|
|
|
008793 |
|
|
|
008793 |
st->connections = NULL;
|
|
|
008793 |
st->ssl_supported = 0; /* not known until post-config and re-merged */
|
|
|
008793 |
@@ -2977,12 +2976,12 @@
|
|
|
008793 |
st_vhost = (util_ldap_state_t *)
|
|
|
008793 |
ap_get_module_config(s_vhost->module_config,
|
|
|
008793 |
&ldap_module);
|
|
|
008793 |
-
|
|
|
008793 |
+ st_vhost->util_ldap_cache = st->util_ldap_cache;
|
|
|
008793 |
+ st_vhost->util_ldap_cache_lock = st->util_ldap_cache_lock;
|
|
|
008793 |
#if APR_HAS_SHARED_MEMORY
|
|
|
008793 |
st_vhost->cache_shm = st->cache_shm;
|
|
|
008793 |
st_vhost->cache_rmm = st->cache_rmm;
|
|
|
008793 |
st_vhost->cache_file = st->cache_file;
|
|
|
008793 |
- st_vhost->util_ldap_cache = st->util_ldap_cache;
|
|
|
008793 |
ap_log_error(APLOG_MARK, APLOG_DEBUG, result, s, APLOGNO(01316)
|
|
|
008793 |
"LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp "
|
|
|
008793 |
"for VHOST: %s", st->cache_shm, st->cache_rmm,
|