diff options
| author | Eric Covener <covener@apache.org> | 2010-06-04 03:58:46 +0200 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2010-06-04 03:58:46 +0200 |
| commit | dd90ac4591199c4249d6f109e9d3870e814424ed (patch) | |
| tree | cf59b36657b97d869dc5585d75a5b84daaa0c8ab /modules/ldap/util_ldap.c | |
| parent | mod_disk_cache: Decline the opportunity to cache if the response is (diff) | |
| download | apache2-dd90ac4591199c4249d6f109e9d3870e814424ed.tar.xz apache2-dd90ac4591199c4249d6f109e9d3870e814424ed.zip | |
when we actually get a per-server config in a vhost, the shared memory
cache was not in the merged config.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951235 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/ldap/util_ldap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index 9643cf7d18..b3c22a2f4f 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -2609,6 +2609,9 @@ static void *util_ldap_create_config(apr_pool_t *p, server_rec *s) return st; } +/* cache-related settings are not merged here, but in the post_config hook, + * since the cache has not yet sprung to life + */ static void *util_ldap_merge_config(apr_pool_t *p, void *basev, void *overridesv) { @@ -2751,6 +2754,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, 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, "LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp " "for VHOST: %s", st->cache_shm, st->cache_rmm, |