I didn't miss the SVN conversion horizion?
This needs to hit jk before we roll out 1.2.15. 1.152 broke Apache 2.0
builds (while conforming to Apache 2.2) - so this patch is the umbrella
which addresses both flavors.
Bill
-------- Original Message --------
Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date: 12 Sep 2005 22:21:31 -0000
From: [EMAIL PROTECTED]
Reply-To: Tomcat Developers List <tomcat-dev@jakarta.apache.org>
To: [EMAIL PROTECTED]
wrowe 2005/09/12 15:21:31
Modified: jk/native/apache-2.0 mod_jk.c
Log:
Modify the test introduced in 1.152 for httpd-2.2 compatibility, the
new symbol isn't available in httpd-2.0 leading to perms issues.
This patch anticipates that the flag will become a 0|1 flag defined
always before httpd-2.2 ships.
Revision Changes Path
1.154 +16 -2
jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mod_jk.c 12 Sep 2005 13:26:06 -0000 1.153
+++ mod_jk.c 12 Sep 2005 22:21:31 -0000 1.154
@@ -68,7 +68,21 @@
#include "apr_strings.h"
+/* Yes; sorta sucks - with luck we will clean this up before httpd-2.2
+ * ships, leaving AP_NEED_SET_MUTEX_PERMS def'd as 1 or 0 on all
platforms.
+ */
#ifdef AP_NEED_SET_MUTEX_PERMS
+# define JK_NEED_SET_MUTEX_PERMS AP_NEED_SET_MUTEX_PERMS
+#else
+ /* A special case for httpd-2.0 */
+# if !defined(OS2) && !defined(WIN32) && !defined(BEOS) &&
!defined(NETWARE)
+# define JK_NEED_SET_MUTEX_PERMS 1
+# else
+# define JK_NEED_SET_MUTEX_PERMS 0
+# endif
+#endif
+
+#if JK_NEED_SET_MUTEX_PERMS
#include "unixd.h" /* for unixd_set_global_mutex_perms */
#endif
/*
@@ -2419,7 +2433,7 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
-#ifdef AP_NEED_SET_MUTEX_PERMS
+#ifdef JK_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(jk_log_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
