Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 87565 invoked from network); 22 Feb 2004 10:23:03 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 22 Feb 2004 10:23:03 -0000 Received: (qmail 71745 invoked by uid 500); 22 Feb 2004 10:22:36 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 71714 invoked by uid 500); 22 Feb 2004 10:22:36 -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 71701 invoked by uid 500); 22 Feb 2004 10:22:36 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 71697 invoked from network); 22 Feb 2004 10:22:36 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 22 Feb 2004 10:22:36 -0000 Received: (qmail 87552 invoked by uid 1582); 22 Feb 2004 10:23:02 -0000 Date: 22 Feb 2004 10:23:01 -0000 Message-ID: <20040222102301.87551.qmail@minotaur.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/ssl ssl_scache_shmcb.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/22 02:23:01 Modified: modules/ssl ssl_scache_shmcb.c Log: * modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_init): Use an anonymous shm segment by default or fall back on name-based shm. Revision Changes Path 1.24 +13 -4 httpd-2.0/modules/ssl/ssl_scache_shmcb.c Index: ssl_scache_shmcb.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmcb.c,v retrieving revision 1.23 retrieving revision 1.24 diff -w -d -u -r1.23 -r1.24 --- ssl_scache_shmcb.c 9 Feb 2004 20:29:22 -0000 1.23 +++ ssl_scache_shmcb.c 22 Feb 2004 10:23:01 -0000 1.24 @@ -339,10 +339,19 @@ ssl_die(); } - if ((rv = apr_shm_create(&(mc->pSessionCacheDataMM), + /* Use anonymous shm by default, fall back on name-based. */ + rv = apr_shm_create(&(mc->pSessionCacheDataMM), + mc->nSessionCacheDataSize, + NULL, mc->pPool); + + if (APR_STATUS_IS_ENOTIMPL(rv)) { + rv = apr_shm_create(&(mc->pSessionCacheDataMM), mc->nSessionCacheDataSize, mc->szSessionCacheDataFile, - mc->pPool)) != APR_SUCCESS) { + mc->pPool); + } + + if (rv != APR_SUCCESS) { char buf[100]; ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Cannot allocate shared memory: (%d)%s", rv,