Author: rjung
Date: Sun Nov 11 08:58:05 2007
New Revision: 593930
URL: http://svn.apache.org/viewvc?rev=593930&view=rev
Log:
Prevent crash, if worker_name is still NULL.
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
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?rev=593930&r1=593929&r2=593930&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Nov 11 08:58:05
2007
@@ -2137,13 +2137,13 @@
if (JK_IS_DEBUG_LEVEL(xconf->log))
jk_log(xconf->log, JK_LOG_DEBUG, "Into handler %s worker=%s"
" r->proxyreq=%d",
- r->handler, worker_name, r->proxyreq);
+ r->handler, STRNULL_FOR_NULL(worker_name), r->proxyreq);
/* If this is a proxy request, we'll notify an error */
if (r->proxyreq) {
jk_log(xconf->log, JK_LOG_INFO, "Proxy request for worker=%s"
" is not allowed",
- worker_name);
+ STRNULL_FOR_NULL(worker_name));
JK_TRACE_EXIT(xconf->log);
return HTTP_INTERNAL_SERVER_ERROR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
