summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2004-09-22 17:32:09 +0200
committerJoe Orton <jorton@apache.org>2004-09-22 17:32:09 +0200
commitc343d09de4d98a994223f72924650eb5fd4bac74 (patch)
tree55a866cf21dbbb9da3b7a87b6868f80faa33b87e /modules
parent* server/scoreboard.c (create_namebased_scoreboard): Use (diff)
downloadapache2-c343d09de4d98a994223f72924650eb5fd4bac74.tar.xz
apache2-c343d09de4d98a994223f72924650eb5fd4bac74.zip
* modules/ssl/ssl_scache_shmcb.c (ssl_scahe_shmcb_init): If anonymous
shm is not supported, always remove the named segment first to cope with unclean shutdowns. PR: 21335 (continued) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105249 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/ssl/ssl_scache_shmcb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/ssl/ssl_scache_shmcb.c b/modules/ssl/ssl_scache_shmcb.c
index ee02a407ec..a23aa0214f 100644
--- a/modules/ssl/ssl_scache_shmcb.c
+++ b/modules/ssl/ssl_scache_shmcb.c
@@ -345,6 +345,10 @@ void ssl_scache_shmcb_init(server_rec *s, apr_pool_t *p)
NULL, mc->pPool);
if (APR_STATUS_IS_ENOTIMPL(rv)) {
+ /* For a name-based segment, remove it first in case of a
+ * previous unclean shutdown. */
+ apr_shm_remove(mc->szSessionCacheDataFile, mc->pPool);
+
rv = apr_shm_create(&(mc->pSessionCacheDataMM),
mc->nSessionCacheDataSize,
mc->szSessionCacheDataFile,