From: Eric Covener <covener@apache.org>
Date: Fri, 4 Jun 2010 01:58:46 +0000 (+0000)
Subject: when we actually get a per-server config in a vhost, the shared memory
X-Git-Tag: 2.3.6~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd90ac4591199c4249d6f109e9d3870e814424ed;p=apache

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
---

diff --git a/CHANGES b/CHANGES
index 4e58c804d6..62805fffb9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,10 @@ Changes with Apache 2.3.6
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
+  *) mod_ldap: LDAP caching is suppressed (and ldap-status handler returns 
+     title page only) when any mod_ldap directives are used in VirtualHost 
+     context.  [Eric Covener]
+
   *) mod_disk_cache: Decline the opportunity to cache if the response is
      a 206 Partial Content. This stops a reverse proxied partial response
      from becoming cached, and then being served in subsequent responses.
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,