Author: rjung
Date: Mon Apr 9 09:09:39 2007
New Revision: 526804
URL: http://svn.apache.org/viewvc?view=rev&rev=526804
Log:
- apache: change one log line: use white space instead of new line to
prevent line based log format
- apache 1.3: change precompiler directive position, so that info
startup message gets logged (like in apache 2.0)
- apache 1.3: add trace messages to new child init handler
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=526804&r1=526803&r2=526804
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Apr 9 09:09:39
2007
@@ -675,7 +675,7 @@
s->ssl_cert_len = strlen(s->ssl_cert);
if (JK_IS_DEBUG_LEVEL(conf->log)) {
jk_log(conf->log, JK_LOG_DEBUG,
- "SSL client certificate (%d bytes):\n%s",
+ "SSL client certificate (%d bytes): %s",
s->ssl_cert_len, s->ssl_cert);
}
}
@@ -2624,10 +2624,10 @@
#if MODULE_MAGIC_NUMBER >= 19980527
/* Tell apache we're here */
ap_add_version_component(JK_EXPOSED_VERSION);
+#endif
jk_log(conf->log, JK_LOG_INFO,
"%s initialized",
JK_EXPOSED_VERSION);
-#endif
return;
}
else {
@@ -2873,6 +2873,8 @@
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
+ JK_TRACE_ENTER(conf->log);
+
if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
if (JK_IS_DEBUG_LEVEL(conf->log))
jk_log(conf->log, JK_LOG_DEBUG, "Attached shm:%s",
@@ -2881,6 +2883,9 @@
else
jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
jk_shm_name(), rc);
+
+ JK_TRACE_EXIT(conf->log);
+
}
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=526804&r1=526803&r2=526804
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Apr 9 09:09:39
2007
@@ -702,7 +702,7 @@
s->ssl_cert_len = strlen(s->ssl_cert);
if (JK_IS_DEBUG_LEVEL(conf->log)) {
jk_log(conf->log, JK_LOG_DEBUG,
- "SSL client certificate (%d bytes):\n%s",
+ "SSL client certificate (%d bytes): %s",
s->ssl_cert_len, s->ssl_cert);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
