mturk 2005/04/28 04:28:46
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Add default 'logs/jk-runtime-status' if JkShmFile was not specified.
Revision Changes Path
1.78 +10 -1 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mod_jk.c 24 Apr 2005 10:02:16 -0000 1.77
+++ mod_jk.c 28 Apr 2005 11:28:45 -0000 1.78
@@ -1979,6 +1979,15 @@
main_log = conf->log;
}
}
+#if !defined(WIN32) && !defined(NETWARE)
+ if (!jk_shm_file) {
+ jk_shm_file = ap_server_root_relative(p, "logs/jk-runtime-status");
+ if (jk_shm_file)
+ ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, NULL,
+ "No JkShmFile defined in httpd.conf. "
+ "Using default %s", jk_shm_file);
+ }
+#endif
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf->log))
1.141 +11 -1 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.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mod_jk.c 24 Apr 2005 10:02:16 -0000 1.140
+++ mod_jk.c 28 Apr 2005 11:28:46 -0000 1.141
@@ -2329,6 +2329,16 @@
/* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf->worker_properties;
+#if !defined(WIN32) && !defined(NETWARE)
+ if (!jk_shm_file) {
+ jk_shm_file = ap_server_root_relative(pconf,
"logs/jk-runtime-status");
+ if (jk_shm_file)
+ ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
+ 0, NULL,
+ "No JkShmFile defined in httpd.conf. "
+ "Using default %s", jk_shm_file);
+ }
+#endif
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf->log))
jk_log(conf->log, JK_LOG_DEBUG, "Initialized shm:%s",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
