You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2010/06/04 03:58:46 UTC
svn commit: r951235 - in /httpd/httpd/trunk: CHANGES modules/ldap/util_ldap.c
Author: covener
Date: Fri Jun 4 01:58:46 2010
New Revision: 951235
URL: http://svn.apache.org/viewvc?rev=951235&view=rev
Log:
when we actually get a per-server config in a vhost, the shared memory
cache was not in the merged config.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/ldap/util_ldap.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=951235&r1=951234&r2=951235&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jun 4 01:58:46 2010
@@ -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.
Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=951235&r1=951234&r2=951235&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Fri Jun 4 01:58:46 2010
@@ -2609,6 +2609,9 @@ static void *util_ldap_create_config(apr
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_poo
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,