mturk 2002/09/26 03:26:33
Modified: jk/native2/common jk_uriEnv.c
Log:
Fix non APR parseName
Revision Changes Path
1.32 +3 -4 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_uriEnv.c 26 Sep 2002 09:26:20 -0000 1.31
+++ jk_uriEnv.c 26 Sep 2002 10:26:33 -0000 1.32
@@ -135,9 +135,7 @@
}
else
uri = strchr(host, '/');
-
- uriEnv->uri = uri;
-
+
if (!uri) {
/* That's a virtual host definition ( no actual mapping, just global
* settings like aliases, etc
@@ -155,12 +153,13 @@
uriEnv->port = atoi(colon);
}
/* If it doesn't start with /, it must have a vhost */
- if (strlen(host)) {
+ if (strlen(host) && uri != host) {
uriEnv->virtual = uriEnv->pool->calloc( env, uriEnv->pool, strlen(host) + 1
);
strncpy(uriEnv->virtual, name, strlen(host));
}
else
uriEnv->virtual = "*";
+ uriEnv->uri = uriEnv->pool->pstrdup(env, uriEnv->pool, path);
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
