mturk 2002/09/24 10:07:14
Modified: jk/native2/common jk_uriMap.c
Log:
Create the missing vhosts.
Fix the hostname resolution already containing colon and port.
Revision Changes Path
1.43 +13 -14 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- jk_uriMap.c 24 Sep 2002 16:54:31 -0000 1.42
+++ jk_uriMap.c 24 Sep 2002 17:07:14 -0000 1.43
@@ -299,24 +299,23 @@
jk_uriEnv_t *uriEnv = uriMap->maps->valueAt(env, uriMap->maps, i);
if (uriEnv == NULL)
continue;
- if (uriEnv->match_type == MATCH_TYPE_HOST) {
- jk2_map_default_create(env, &uriEnv->webapps, uriMap->pool);
- if (uriEnv->virtual != NULL && strlen(uriEnv->virtual)) {
- uriMap->vhosts->put(env, uriMap->vhosts,
- uriEnv->virtual, uriEnv, NULL);
- }
- }
- /* Create the missing vhosts */
- else if (uriEnv->virtual != NULL && strlen(uriEnv->virtual)) {
- if (!uriMap->vhosts->get(env, uriMap->vhosts,
- uriEnv->virtual)) {
+ if (uriEnv->virtual != NULL && strlen(uriEnv->virtual)) {
+ if (uriEnv->match_type == MATCH_TYPE_HOST) {
jk2_map_default_create(env, &uriEnv->webapps, uriMap->pool);
uriMap->vhosts->put(env, uriMap->vhosts,
uriEnv->virtual, uriEnv, NULL);
+ }
+ else { /* Create the missing vhosts */
+ if (!uriMap->vhosts->get(env, uriMap->vhosts,
+ uriEnv->virtual)) {
+ jk2_map_default_create(env, &uriEnv->webapps, uriMap->pool);
+ uriMap->vhosts->put(env, uriMap->vhosts,
+ uriEnv->virtual, uriEnv, NULL);
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "uriMap.init() Fixing Host %s\n",
- uriEnv->virtual);
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "uriMap.init() Fixing Host %s\n",
+ uriEnv->virtual);
+ }
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
