You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.2 KiB
26 lines
1.2 KiB
5 years ago
|
--- a/modules/ldap/util_ldap.c 2018/02/20 13:00:39 1824871
|
||
|
|
+++ b/modules/ldap/util_ldap.c 2018/02/20 13:02:54 1824872
|
||
|
|
@@ -2858,7 +2858,6 @@
|
||
|
|
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; /* not known until post-config and re-merged */
|
||
|
|
@@ -2977,12 +2976,12 @@
|
||
|
|
st_vhost = (util_ldap_state_t *)
|
||
|
|
ap_get_module_config(s_vhost->module_config,
|
||
|
|
&ldap_module);
|
||
|
|
-
|
||
|
|
+ st_vhost->util_ldap_cache = st->util_ldap_cache;
|
||
|
|
+ st_vhost->util_ldap_cache_lock = st->util_ldap_cache_lock;
|
||
|
|
#if APR_HAS_SHARED_MEMORY
|
||
|
|
st_vhost->cache_shm = st->cache_shm;
|
||
|
|
st_vhost->cache_rmm = st->cache_rmm;
|
||
|
|
st_vhost->cache_file = st->cache_file;
|
||
|
|
- st_vhost->util_ldap_cache = st->util_ldap_cache;
|
||
|
|
ap_log_error(APLOG_MARK, APLOG_DEBUG, result, s, APLOGNO(01316)
|
||
|
|
"LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp "
|
||
|
|
"for VHOST: %s", st->cache_shm, st->cache_rmm,
|