mturk 2002/09/23 10:40:17
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Supply the hostname if not virtual and port if not default to the uriMap
Revision Changes Path
1.53 +10 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_jk2.c 22 Sep 2002 09:35:46 -0000 1.52
+++ mod_jk2.c 23 Sep 2002 17:40:17 -0000 1.53
@@ -629,7 +629,8 @@
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
-
+ int port;
+
if(r->proxyreq || workerEnv==NULL) {
return DECLINED;
}
@@ -677,10 +678,14 @@
If positive, we'll fill a ws_service_t and do the rewrite and
the real mapping.
*/
-
+
+ port = ap_get_server_port(r);
+ if (ap_is_default_port(port, r))
+ port = 0;
uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
- r->server->is_virtual ? r->hostname : NULL,
- r->uri );
+ r->server->is_virtual ? ap_get_server_name(r) : NULL,
+ port,
+ r->uri);
if( uriEnv== NULL || uriEnv->workerName == NULL) {
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
