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 Wed, 25 Sep 2002 14:42:51 GMT
mturk       2002/09/25 07:42:51

  Modified:    jk/native2/common jk_uriMap.c
  Log:
  Change the order of mapping if the exact map is not found.
  Check the aliases prior to the *:port.
  
  Revision  Changes    Path
  1.44      +3 -3      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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jk_uriMap.c	24 Sep 2002 17:07:14 -0000	1.43
  +++ jk_uriMap.c	25 Sep 2002 14:42:51 -0000	1.44
  @@ -260,9 +260,6 @@
               if (port == 0 || port == uriEnv->port)
                   return uriEnv;
           }
  -        else if (port && strcasecmp(name, vv) == 0) {
  -            return uriEnv;
  -        }
           else if (uriEnv->aliases) {
               int m = uriEnv->aliases->size(env, uriEnv->aliases);
               for (j = 0; j < m; j++) {
  @@ -272,6 +269,9 @@
                           return uriEnv;
                   }
               }
  +        }
  +        else if (port && strcasecmp(name, vv) == 0) {
  +            return uriEnv;
           }
       }
       return uriMap->vhosts->get(env, uriMap->vhosts, "*");
  
  
  

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