tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_uriEnv.h
Date Mon, 29 Apr 2002 19:13:32 GMT
costin      02/04/29 12:13:32

  Modified:    jk/native2/common jk_uriEnv.c
               jk/native2/include jk_uriEnv.h
  Log:
  Merged Glenn's fix from mod_jk1.
  
  ( the part with 'global' mappings )
  
  Revision  Changes    Path
  1.11      +15 -1     jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_uriEnv.c	28 Apr 2002 00:19:27 -0000	1.10
  +++ jk_uriEnv.c	29 Apr 2002 19:13:32 -0000	1.11
  @@ -208,7 +208,21 @@
        */
       asterisk--;
       if ('/' == asterisk[0]) {
  -        if ('.' == asterisk[2]) {
  +        if ( 0 == strncmp("/*/",uri,3) ) {
  +            /* general context path */
  +            asterisk[1] = '\0';
  +            uriEnv->suffix  = asterisk + 2;
  +            uriEnv->prefix = uri;
  +            uriEnv->prefix_len  =strlen( uriEnv->prefix );
  +            uriEnv->match_type = MATCH_TYPE_CONTEXT_PATH;
  +
  +            if( uriEnv->debug > 0 ) {
  +                env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                              "Into jk_uri_worker_map_t::uri_worker_map_open, "
  +                              "general context path rule %s * %s -> %s was added\n",
  +                              uri, asterisk + 2, uriEnv->workerName);
  +
  +        } else if ('.' == asterisk[2]) {
               /* suffix rule: /foo/bar/STAR.extension */
               asterisk[1]      = '\0';
               asterisk[2]      = '\0';
  
  
  
  1.9       +2 -0      jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h
  
  Index: jk_uriEnv.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_uriEnv.h	18 Mar 2002 17:56:40 -0000	1.8
  +++ jk_uriEnv.h	29 Apr 2002 19:13:32 -0000	1.9
  @@ -92,6 +92,8 @@
   #define MATCH_TYPE_CONTEXT  (1)
   #define MATCH_TYPE_SUFFIX   (2)
   #define MATCH_TYPE_GENERAL_SUFFIX (3) /* match all URIs of the form *ext */
  +/* match all context path URIs with a path component suffix */
  +#define MATCH_TYPE_CONTEXT_PATH (4)
   
   
   struct jk_uriEnv {
  
  
  

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