You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/09/22 17:32:10 UTC
cvs commit: httpd-2.0/modules/ssl ssl_scache_shmcb.c
jorton 2004/09/22 08:32:10
Modified: modules/ssl ssl_scache_shmcb.c
Log:
* 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)
Revision Changes Path
1.28 +4 -0 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.27
retrieving revision 1.28
diff -d -w -u -r1.27 -r1.28
--- ssl_scache_shmcb.c 27 May 2004 09:20:00 -0000 1.27
+++ ssl_scache_shmcb.c 22 Sep 2004 15:32:09 -0000 1.28
@@ -345,6 +345,10 @@
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,