You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2002/08/15 11:27:41 UTC

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

mturk       2002/08/15 02:27:41

  Modified:    jk/native2/server/apache13 mod_jk2.c
  Log:
  After succesfull call to the mapUri call the mapUri again with the reverse flag set.
  This will decline the 'reverse' mappings.
  
  Revision  Changes    Path
  1.17      +9 -2      jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
  
  Index: mod_jk2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_jk2.c	10 Jun 2002 21:55:08 -0000	1.16
  +++ mod_jk2.c	15 Aug 2002 09:27:41 -0000	1.17
  @@ -438,11 +438,18 @@
       /* get_env() */
       env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
           
  -    uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri );
  +    uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, 0 );
       
       if(uriEnv==NULL || uriEnv->workerName==NULL) {
           workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
           return DECLINED;
  +    }
  +    else {
  +        jk_uriEnv_t *rriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,r->uri, 1 );
  +        if (rriEnv != NULL && rriEnv->workerName != NULL) {
  +            workerEnv->globalEnv->releaseEnv(workerEnv->globalEnv, env );
  +            return DECLINED;
  +        }
       }
   
       ap_set_module_config( r->request_config, &jk2_module, uriEnv );
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>