RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c

[Mladen Turk]

> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] 
> Sent: Sunday, September 22, 2002 4:51 AM

>        /* As per Servlet spec, do exact match first */
>        match=jk2_uriMap_exactMap( env, uriMap, 
> ctxEnv->exactMatch, uri, uriLen, reverse );
>   -    if( match != NULL ) {
>   +    if( match != NULL && 
>   +            (( match->virtual==NULL && hostEnv->virtual==NULL ) || 
>   +             ( hostEnv->virtual!=NULL && 
> strcasecmp(match->virtual,hostEnv->virtual)==0 ))
>   +       ) {

Each uri shoud allready be in the right ctxEnv (look at uriMap init
phase).
Each vhost is a separate context with it's own match tables.
Don't think this is the correct patch.

>   +    
>        uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
>   -                r->server->is_virtual ? 
> r->server->server_hostname : NULL,
>   +                
> apr_psprintf(r->pool,"%s:%d",r->hostname,r->server->port),
>                    r->uri );
>    

Using r->hostname is correct, but not appending the :port

Should be something like (from mod_proxy) this:

    if (r->hostname != NULL)
        return r->hostname;

    /* Set url to the first char after "scheme://" */
    if ((url = strchr(r->uri, ':')) == NULL
        || url[1] != '/' || url[2] != '/')
        return NULL;

MT.


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>