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/common jk_uriMap.c
Date Thu, 15 Aug 2002 11:24:54 GMT
mturk       2002/08/15 04:24:54

  Modified:    jk/native2/common jk_uriMap.c
  Log:
  uriMap is now the wrapper for positive/negative calls to the 'real'
  map function.
  
  Revision  Changes    Path
  1.37      +18 -4     jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
  
  Index: jk_uriMap.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- jk_uriMap.c	15 Aug 2002 09:25:18 -0000	1.36
  +++ jk_uriMap.c	15 Aug 2002 11:24:54 -0000	1.37
  @@ -79,7 +79,7 @@
   
   static jk_uriEnv_t *jk2_uriMap_mapUri(jk_env_t *env, jk_uriMap_t *uriMap,
                                         const char *vhost,
  -                                      const char *uri, int reverse);
  +                                      const char *uri);
   
   static int jk2_uriMap_checkUri(jk_env_t *env, jk_uriMap_t *uriMap, 
                                  const char *uri);
  @@ -551,9 +551,9 @@
   
   #define SAFE_URI_SIZE 8192
   
  -static jk_uriEnv_t *jk2_uriMap_mapUri(jk_env_t *env, jk_uriMap_t *uriMap,
  -                                      const char *vhost,
  -                                      const char *uri, int reverse)
  +static jk_uriEnv_t *jk2_uriMap_map(jk_env_t *env, jk_uriMap_t *uriMap,
  +                                   const char *vhost,
  +                                   const char *uri, int reverse)
   {
       int best_match = -1;
       int longest_match = 0;
  @@ -702,6 +702,20 @@
                         "uriMap.mapUri() no match found\n"); 
   
       return NULL;
  +}
  +
  +static jk_uriEnv_t *jk2_uriMap_mapUri(jk_env_t *env, jk_uriMap_t *uriMap,
  +                                      const char *vhost, const char *uri)
  +{
  +    jk_uriEnv_t *match;
  +    
  +    match = jk2_uriMap_map(env, uriMap, vhost, uri, 0);
  +    if (match) {
  +        jk_uriEnv_t *rmatch = jk2_uriMap_map(env, uriMap, vhost, uri, 1);
  +        if (rmatch)
  +            return NULL;
  +    }
  +    return match;
   }
   
   int JK_METHOD jk2_uriMap_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
  
  
  

--
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