mturk 2005/02/22 06:40:39
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Use log warning if JkShmFile was not defined on non WIN32/NETWARE.
Revision Changes Path
1.73 +2 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mod_jk.c 21 Feb 2005 18:00:41 -0000 1.72
+++ mod_jk.c 22 Feb 2005 14:40:36 -0000 1.73
@@ -1985,7 +1985,7 @@
else
jk_log(conf->log, JK_LOG_ERROR, "Initializing shm:%s errno=%d",
jk_shm_name(), rc);
-#if !defined (WIN32) || !defined(NETWARE)
+#if !defined(WIN32) && !defined(NETWARE)
if (!jk_shm_file)
ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, NULL,
"No JkShmFile defined in httpd.conf. "
1.130 +2 -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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- mod_jk.c 21 Feb 2005 18:00:41 -0000 1.129
+++ mod_jk.c 22 Feb 2005 14:40:37 -0000 1.130
@@ -2348,7 +2348,7 @@
else
jk_log(conf->log, JK_LOG_ERROR, "Initializing shm:%s errno=%d",
jk_shm_name(), rc);
-#if !defined (WIN32) || !defined(NETWARE)
+#if !defined(WIN32) && !defined(NETWARE)
if (!jk_shm_file)
ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
0, NULL,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
