You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/05/13 09:38:31 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_mutex.c
jerenkrantz 02/05/13 00:38:31
Modified: modules/ssl ssl_engine_mutex.c
Log:
Apply same patch (nee hack) to mod_ssl as was done to mod_rewrite to
get cross-process mutex permissions working.
This is waiting for a proper APR interface, but this does not mean that
we should remain broken in the meantime.
Revision Changes Path
1.14 +15 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ssl_engine_mutex.c 9 Apr 2002 15:53:09 -0000 1.13
+++ ssl_engine_mutex.c 13 May 2002 07:38:30 -0000 1.14
@@ -61,10 +61,16 @@
because DEC 25 = OCT 31.''
-- Unknown */
#include "mod_ssl.h"
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#include "unixd.h"
+#endif
int ssl_mutex_init(server_rec *s, apr_pool_t *p)
{
SSLModConfigRec *mc = myModConfig(s);
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+ apr_status_t rv;
+#endif
if (mc->nMutexMode == SSL_MUTEXMODE_NONE)
return TRUE;
@@ -76,6 +82,15 @@
mc->szMutexFile);
return FALSE;
}
+
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+ rv = unixd_set_global_mutex_perms_lock(mc->pMutex);
+ if (rv != APR_SUCCESS) {
+ ssl_log(s, SSL_LOG_ERROR, "Could not set permissions on "
+ "ssl_mutex; check User and Group directives");
+ return FALSE;
+ }
+#endif
return TRUE;
}