Author: rjung
Date: Mon Nov 19 11:30:29 2007
New Revision: 596406
URL: http://svn.apache.org/viewvc?rev=596406&view=rev
Log:
Return DECLINED for NULL uw_map. This allows to have configured vhosts that
have no
mappings without need to initialize an empty uw_map.
Ported from r591962 of apache-2.0/mod_jk.c.
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?rev=596406&r1=596405&r2=596406&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Nov 19 11:30:29
2007
@@ -2647,7 +2647,17 @@
}
ap_no2slash(clean_uri);
- worker = map_uri_to_worker(conf->uw_map, clean_uri, NULL,
conf->log);
+ if (!conf->uw_map) {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "missing uri map for %s:%s",
+ conf->s->server_hostname ? conf->s->server_hostname
: "_default_",
+ r->uri);
+ return DECLINED;
+ }
+ else
+ worker = map_uri_to_worker(conf->uw_map, clean_uri,
+ NULL, conf->log);
/* Don't know the worker, ForwardDirectories is set, there is a
* previous request for which the handler is JK_HANDLER (as set by
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
