Return-Path: X-Original-To: apmail-httpd-dev-archive@www.apache.org Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 50D611FE2 for ; Tue, 26 Apr 2011 05:56:25 +0000 (UTC) Received: (qmail 21793 invoked by uid 500); 26 Apr 2011 05:56:24 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 21713 invoked by uid 500); 26 Apr 2011 05:56:23 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 21699 invoked by uid 99); 26 Apr 2011 05:56:19 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 05:56:19 +0000 Received: by minotaur.apache.org (Postfix, from userid 2161) id AC4D51FB9; Tue, 26 Apr 2011 05:56:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by euler.heimnetz.de (Postfix) with ESMTP id 9D57924044 for ; Tue, 26 Apr 2011 07:56:28 +0200 (CEST) Message-ID: <4DB65E8C.6080105@apache.org> Date: Tue, 26 Apr 2011 07:56:28 +0200 From: Ruediger Pluem User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.24) Gecko/20100301 SeaMonkey/1.1.19 MIME-Version: 1.0 To: dev@httpd.apache.org Subject: Re: svn commit: r1096577 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_ldap.xml modules/ldap/util_ldap.c modules/ldap/util_ldap_cache.c modules/ldap/util_ldap_cache_mgr.c References: <20110425200044.57DC023889DA@eris.apache.org> In-Reply-To: <20110425200044.57DC023889DA@eris.apache.org> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit On 04/25/2011 10:00 PM, sf@apache.org wrote: > Author: sf > Date: Mon Apr 25 20:00:43 2011 > New Revision: 1096577 > > URL: http://svn.apache.org/viewvc?rev=1096577&view=rev > Log: > mod_ldap: Make LDAPSharedCacheSize 0 create a non-shared-memory cache per > process as opposed to disabling caching completely. This allows to use > the non-shared-memory cache as a workaround for the shared memory cache > not being available during graceful restarts > > PR: 48958 > > Modified: > httpd/httpd/trunk/CHANGES > httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml > httpd/httpd/trunk/modules/ldap/util_ldap.c > httpd/httpd/trunk/modules/ldap/util_ldap_cache.c > httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c > > Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c?rev=1096577&r1=1096576&r2=1096577&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c (original) > +++ httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c Mon Apr 25 20:00:43 2011 > @@ -363,6 +366,14 @@ util_ald_cache_t *util_ald_create_cache( > cache->nodes = (util_cache_node_t **)util_ald_alloc(cache, cache->size * sizeof(util_cache_node_t *)); > if (!cache->nodes) { > util_ald_free(cache, cache); > +#if APR_HAS_SHARED_MEMORY > + if (!st->cache_rmm) > + free(cache); > + else > + apr_rmm_free(st->cache_rmm, block); > +#else > + free(cache); Do we ever alloc cache #if !APR_HAS_SHARED_MEMORY? > +#endif > return NULL; > } > Regards Rüdiger