Author: mturk
Date: Mon Nov 5 03:30:28 2007
New Revision: 591962
URL: http://svn.apache.org/viewvc?rev=591962&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
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=591962&r1=591961&r2=591962&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 Mon Nov 5 03:30:28
2007
@@ -2918,8 +2918,17 @@
return DECLINED;
}
}
+ if (!conf->uw_map) {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Into translate empty uri map for uri=%s",
+ r->uri);
- worker = map_uri_to_worker(conf->uw_map, r->uri, NULL, conf->log);
+ return DECLINED;
+ }
+ else
+ worker = map_uri_to_worker(conf->uw_map, r->uri,
+ NULL, conf->log);
if (worker) {
r->handler = apr_pstrdup(r->pool, JK_HANDLER);
@@ -3060,8 +3069,17 @@
return DECLINED;
}
+ if (!conf->uw_map) {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Into map_to_storage empty uri map for uri=%s",
+ r->uri);
- worker = map_uri_to_worker(conf->uw_map, r->uri, NULL, conf->log);
+ return DECLINED;
+ }
+ else
+ worker = map_uri_to_worker(conf->uw_map, r->uri,
+ NULL, conf->log);
if (worker) {
r->handler = apr_pstrdup(r->pool, JK_HANDLER);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
