Skip to content

Commit 2e61e8d

Browse files
committed
* modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_init): Use an
anonymous shm segment by default or fall back on name-based shm. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102746 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2a773ca commit 2e61e8d

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

modules/ssl/ssl_scache_shmcb.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,19 @@ void ssl_scache_shmcb_init(server_rec *s, apr_pool_t *p)
339339
ssl_die();
340340
}
341341

342-
if ((rv = apr_shm_create(&(mc->pSessionCacheDataMM),
343-
mc->nSessionCacheDataSize,
344-
mc->szSessionCacheDataFile,
345-
mc->pPool)) != APR_SUCCESS) {
342+
/* Use anonymous shm by default, fall back on name-based. */
343+
rv = apr_shm_create(&(mc->pSessionCacheDataMM),
344+
mc->nSessionCacheDataSize,
345+
NULL, mc->pPool);
346+
347+
if (APR_STATUS_IS_ENOTIMPL(rv)) {
348+
rv = apr_shm_create(&(mc->pSessionCacheDataMM),
349+
mc->nSessionCacheDataSize,
350+
mc->szSessionCacheDataFile,
351+
mc->pPool);
352+
}
353+
354+
if (rv != APR_SUCCESS) {
346355
char buf[100];
347356
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
348357
"Cannot allocate shared memory: (%d)%s", rv,

0 commit comments

Comments
 (0)