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 jk_uriEnv.c
Date Tue, 22 Oct 2002 10:11:44 GMT
mturk       2002/10/22 03:11:44

  Modified:    jk/native2/common jk_uriMap.c jk_uriEnv.c
  Log:
  Fix the stupid MSVC CR+LF line endings.
  
  Revision  Changes    Path
  1.57      +15 -15    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.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- jk_uriMap.c	21 Oct 2002 18:05:13 -0000	1.56
  +++ jk_uriMap.c	22 Oct 2002 10:11:43 -0000	1.57
  @@ -328,21 +328,21 @@
   static jk_uriEnv_t *jk2_uriMap_regexpMap(jk_env_t *env, jk_uriMap_t *uriMap,
                                            jk_map_t *mapTable, const char *uri) 
   {
  -    int i;    
  -    int sz = mapTable->size(env, mapTable);
  -    
  -    for (i = 0; i < sz; i++) {
  -        jk_uriEnv_t *uwr = mapTable->valueAt(env, mapTable, i);
  -
  -        if (uwr->regexp) {
  -            regex_t *r = (regex_t *)uwr->regexp;
  -            regmatch_t regm[10];
  -            if (!regexec(r, uri, r->re_nsub + 1, regm, 0)) {
  -                return uwr;
  -            }
  -        }
  -    }
  -    return NULL;
  +    int i;    
  +    int sz = mapTable->size(env, mapTable);
  +    
  +    for (i = 0; i < sz; i++) {
  +        jk_uriEnv_t *uwr = mapTable->valueAt(env, mapTable, i);
  +
  +        if (uwr->regexp) {
  +            regex_t *r = (regex_t *)uwr->regexp;
  +            regmatch_t regm[10];
  +            if (!regexec(r, uri, r->re_nsub + 1, regm, 0)) {
  +                return uwr;
  +            }
  +        }
  +    }
  +    return NULL;
   
   }
   #else
  
  
  
  1.40      +3 -3      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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- jk_uriEnv.c	21 Oct 2002 18:05:13 -0000	1.39
  +++ jk_uriEnv.c	22 Oct 2002 10:11:44 -0000	1.40
  @@ -147,11 +147,11 @@
                       uri);
           {
               regex_t *preg = (regex_t *)uriEnv->pool->calloc( env, uriEnv->pool,
sizeof(regex_t));
  -            if (regcomp(preg, uriEnv->uri, REG_EXTENDED)) {
  +            if (regcomp(preg, uriEnv->uri, REG_EXTENDED)) {
                   env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                                 "uriEnv.parseName() error compiling regexp %s\n",
  -                              uri);
  -	            return JK_ERR;
  +                              uri);
  +	            return JK_ERR;
               }
               uriEnv->regexp = preg;
           }
  
  
  

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