tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
Date Thu, 15 Aug 2002 09:27:18 GMT
mturk       2002/08/15 02:27:18

  Modified:    jk/native2/server/apache2 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.48      +9 -3      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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_jk2.c	9 Aug 2002 17:45:49 -0000	1.47
  +++ mod_jk2.c	15 Aug 2002 09:27:18 -0000	1.48
  @@ -677,13 +677,19 @@
          If positive, we'll fill a ws_service_t and do the rewrite and
          the real mapping. 
       */
  -    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 );
       r->handler=JK_HANDLER;
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message