Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 21880 invoked from network); 4 Aug 2004 20:47:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Aug 2004 20:47:33 -0000 Received: (qmail 27325 invoked by uid 500); 4 Aug 2004 20:47:29 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 27247 invoked by uid 500); 4 Aug 2004 20:47:29 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 27191 invoked by uid 500); 4 Aug 2004 20:47:28 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 27106 invoked by uid 99); 4 Aug 2004 20:47:27 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 04 Aug 2004 13:47:25 -0700 Received: (qmail 21600 invoked by uid 1285); 4 Aug 2004 20:47:22 -0000 Date: 4 Aug 2004 20:47:22 -0000 Message-ID: <20040804204722.21599.qmail@minotaur.apache.org> From: bnicholes@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/experimental util_ldap_cache_mgr.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/08/04 13:47:22 Modified: modules/experimental Tag: APACHE_2_0_BRANCH util_ldap_cache_mgr.c Log: Copy the share memory pointers down through the cache hierarchy so that they can be referenced and used in the lower level caches. Reviewed by: bnicholes, minfrin, jjclar Revision Changes Path No revision No revision 1.3.2.12 +4 -1 httpd-2.0/modules/experimental/util_ldap_cache_mgr.c Index: util_ldap_cache_mgr.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache_mgr.c,v retrieving revision 1.3.2.11 retrieving revision 1.3.2.12 diff -u -r1.3.2.11 -r1.3.2.12 --- util_ldap_cache_mgr.c 4 Aug 2004 20:42:19 -0000 1.3.2.11 +++ util_ldap_cache_mgr.c 4 Aug 2004 20:47:21 -0000 1.3.2.12 @@ -284,6 +284,10 @@ if (!cache) return NULL; +#if APR_HAS_SHARED_MEMORY + cache->rmm_addr = st->cache_rmm; + cache->shm_addr = st->cache_shm; +#endif cache->maxentries = st->search_cache_size; cache->numentries = 0; cache->size = st->search_cache_size / 3; @@ -542,7 +546,6 @@ if (r->args && strlen(r->args)) { char cachetype[5], lint[2]; unsigned int id, off; - int ret; char date_str[APR_CTIME_LEN+1]; if ((3 == sscanf(r->args, scanfmt, cachetype, &id, &off, lint)) &&