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/10/12 13:55:30 UTC
cvs commit: httpd-2.0/os/unix os.h
jorton 2004/10/12 04:55:30
Modified: modules/mappers mod_rewrite.c
modules/ssl ssl_engine_mutex.c
os/unix os.h
Log:
* os/unix/os.h: Define AP_NEED_SET_MUTEX_PERMS.
* modules/mappers/mod_rewrite.c, modules/ssl/ssl_engine_mutex.c: Use
AP_NEED_SET_MUTEX_PERMS to determine whether unixd_set_*_mutex_perms
calls are necessary.
Revision Changes Path
1.262 +3 -4 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -d -w -u -r1.261 -r1.262
--- mod_rewrite.c 10 Oct 2004 15:40:33 -0000 1.261
+++ mod_rewrite.c 12 Oct 2004 11:55:30 -0000 1.262
@@ -93,9 +93,8 @@
#include "mod_rewrite.h"
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#ifdef AP_NEED_SET_MUTEX_PERMS
#include "unixd.h"
-#define MOD_REWRITE_SET_MUTEX_PERMS /* XXX Apache should define something */
#endif
/*
@@ -2432,7 +2431,7 @@
return rc;
}
-#ifdef MOD_REWRITE_SET_MUTEX_PERMS
+#ifdef AP_NEED_SET_MUTEX_PERMS
rc = unixd_set_global_mutex_perms(rewrite_mapr_lock_acquire);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
@@ -4029,7 +4028,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef MOD_REWRITE_SET_MUTEX_PERMS
+#ifdef AP_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(rewrite_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
1.32 +3 -3 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.31
retrieving revision 1.32
diff -d -w -u -r1.31 -r1.32
--- ssl_engine_mutex.c 28 Feb 2004 18:06:34 -0000 1.31
+++ ssl_engine_mutex.c 12 Oct 2004 11:55:30 -0000 1.32
@@ -28,9 +28,9 @@
-- Unknown */
#include "ssl_private.h"
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+
+#ifdef AP_NEED_SET_MUTEX_PERMS
#include "unixd.h"
-#define MOD_SSL_SET_MUTEX_PERMS /* XXX Apache should define something */
#endif
int ssl_mutex_init(server_rec *s, apr_pool_t *p)
@@ -57,7 +57,7 @@
return FALSE;
}
-#ifdef MOD_SSL_SET_MUTEX_PERMS
+#ifdef AP_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(mc->pMutex);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
1.25 +5 -0 httpd-2.0/os/unix/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/httpd-2.0/os/unix/os.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -d -w -u -r1.24 -r1.25
--- os.h 1 Oct 2004 16:03:08 -0000 1.24
+++ os.h 12 Oct 2004 11:55:30 -0000 1.25
@@ -23,6 +23,11 @@
#define PLATFORM "Unix"
#endif
+/* On platforms where AP_NEED_SET_MUTEX_PERMS is defined, modules
+ * should call unixd_set_*_mutex_perms on mutexes created in the
+ * parent process. */
+#define AP_NEED_SET_MUTEX_PERMS
+
#ifdef _OSD_POSIX
pid_t os_fork(const char *user);
#endif