You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/11/19 19:48:06 UTC
svn commit: r476878 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Author: rjung
Date: Sun Nov 19 10:48:05 2006
New Revision: 476878
URL: http://svn.apache.org/viewvc?view=rev&rev=476878
Log:
Adding a couple if JK_IS_DEBUG_LEVEL().
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=476878&r1=476877&r2=476878
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Nov 19 10:48:05 2006
@@ -2287,11 +2287,13 @@
/*
{ int i;
-jk_log(conf->log, JK_LOG_DEBUG, "default secret key = %s", conf->secret_key);
+if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG, "default secret key = %s", conf->secret_key);
for (i = 0; i < jk_map_size(conf->automount); i++)
{
char *name = jk_map_name_at(conf->automount, i);
- jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and virtualhost = %s", name, map_get_string(conf->automount, name, NULL));
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and virtualhost = %s", name, map_get_string(conf->automount, name, NULL));
}
}
*/
@@ -2383,8 +2385,9 @@
* already tried mapping and it didn't work out */
worker = worker_env.worker_list[0];
- jk_log(l, JK_LOG_DEBUG, "Manual configuration for %s %s",
- clean_uri, worker_env.worker_list[0]);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG, "Manual configuration for %s %s",
+ clean_uri, worker_env.worker_list[0]);
}
}
@@ -2394,9 +2397,10 @@
}
else if (conf->alias_dir != NULL) {
/* Automatically map uri to a context static file */
- jk_log(l, JK_LOG_DEBUG,
- "check alias_dir: %s",
- conf->alias_dir);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "check alias_dir: %s",
+ conf->alias_dir);
if (strlen(clean_uri) > 1) {
/* Get the context directory name */
char *context_dir = NULL;
@@ -2419,14 +2423,16 @@
}
/* Deny access to WEB-INF and META-INF directories */
if (child_dir != NULL) {
- jk_log(l, JK_LOG_DEBUG,
- "AutoAlias child_dir: %s",
- child_dir);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "AutoAlias child_dir: %s",
+ child_dir);
if (!strcasecmp(child_dir, "WEB-INF") ||
!strcasecmp(child_dir, "META-INF")) {
- jk_log(l, JK_LOG_DEBUG,
- "AutoAlias HTTP_NOT_FOUND for URI: %s",
- r->uri);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "AutoAlias HTTP_NOT_FOUND for URI: %s",
+ r->uri);
return HTTP_NOT_FOUND;
}
}
@@ -2450,9 +2456,10 @@
ap_pclosedir(r->pool, dir);
/* Add code to verify real path ap_os_canonical_name */
if (ret != NULL) {
- jk_log(l, JK_LOG_DEBUG,
- "AutoAlias OK for file: %s",
- ret);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "AutoAlias OK for file: %s",
+ ret);
r->filename = ret;
return OK;
}
@@ -2463,9 +2470,10 @@
if (size > 4
&& !strcasecmp(context_dir + (size - 4),
".war")) {
- jk_log(l, JK_LOG_DEBUG,
- "AutoAlias FORBIDDEN for URI: %s",
- r->uri);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "AutoAlias FORBIDDEN for URI: %s",
+ r->uri);
return FORBIDDEN;
}
}
@@ -2529,8 +2537,9 @@
/* We'll be checking for handler in r->prev later on */
r->main->handler = ap_pstrdup(r->pool, JK_HANDLER);
- jk_log(l, JK_LOG_DEBUG, "ForwardDirectories on: %s",
- r->uri);
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG, "ForwardDirectories on: %s",
+ r->uri);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org