You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2002/01/09 23:21:35 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c ssl_engine_mutex.c
dougm 02/01/09 14:21:35
Modified: modules/ssl ssl_engine_init.c ssl_engine_mutex.c
Log:
call ssl_mutex_kill() during module cleanup
Revision Changes Path
1.22 +1 -2 httpd-2.0/modules/ssl/ssl_engine_init.c
Index: ssl_engine_init.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl_engine_init.c 29 Nov 2001 05:08:47 -0000 1.21
+++ ssl_engine_init.c 9 Jan 2002 22:21:34 -0000 1.22
@@ -991,9 +991,8 @@
* Drop the session cache and mutex
*/
ssl_scache_kill(s);
-#if 0 /* XXX */
+
ssl_mutex_kill(s);
-#endif
/*
* Destroy the temporary keys and params
1.8 +4 -0 httpd-2.0/modules/ssl/ssl_engine_mutex.c
Index: ssl_engine_mutex.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_mutex.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssl_engine_mutex.c 29 Dec 2001 23:16:23 -0000 1.7
+++ ssl_engine_mutex.c 9 Jan 2002 22:21:34 -0000 1.8
@@ -117,8 +117,12 @@
if (mc->nMutexMode == SSL_MUTEXMODE_NONE)
return TRUE;
+ /* XXX: currently mutex is not created until 2nd pass at startup */
+ if (!mc->pMutex)
+ return TRUE;
if (apr_lock_destroy(mc->pMutex) != APR_SUCCESS)
return FALSE;
+ mc->pMutex = NULL;
return TRUE;
}