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/native/common jk_uri_worker_map.c
Date Sat, 12 Feb 2005 19:29:08 GMT
mturk       2005/02/12 11:29:08

  Modified:    jk/native/common jk_uri_worker_map.c
  Log:
  Remove assigments that can be set at global level.
  
  Revision  Changes    Path
  1.45      +4 -20     jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
  
  Index: jk_uri_worker_map.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- jk_uri_worker_map.c	12 Feb 2005 11:55:33 -0000	1.44
  +++ jk_uri_worker_map.c	12 Feb 2005 19:29:08 -0000	1.45
  @@ -294,6 +294,7 @@
           JK_TRACE_EXIT(l);
           return JK_FALSE;
       }
  +    uwr->suffix = NULL;
       
       if (*puri == '!') {
           uwr->no_match = 1;
  @@ -317,21 +318,12 @@
           
           if ((asterisk && strchr(asterisk + 1, '*')) ||
               strchr(uri, '?')) {
  -            uwr->uri = jk_pool_strdup(&uw_map->p, uri);
  -
  -            if (!uwr->uri) {
  -                jk_log(l, JK_LOG_ERROR,
  -                       "can't alloc uri string");
  -                JK_TRACE_EXIT(l);
  -                return JK_FALSE;
  -            }
  +            uwr->uri = uri;
               /* Lets check if we have multiple
                * asterixes in the uri like:
                * /context/ * /user/ *
                */
  -            uwr->worker_name = worker;
               uwr->context = uri;
  -            uwr->suffix = NULL;
               uwr->match_type = MATCH_TYPE_WILDCHAR_PATH;
               jk_log(l, JK_LOG_DEBUG,
                       "wild chars path rule %s=%s was added",
  @@ -358,7 +350,6 @@
                   if (0 == strncmp("/*/", uri, 3)) {
                       /* general context path */
                       asterisk[1] = '\0';
  -                    uwr->worker_name = worker;
                       uwr->context = uri;
                       uwr->suffix = asterisk + 2;
                       uwr->match_type = MATCH_TYPE_CONTEXT_PATH;
  @@ -369,7 +360,6 @@
                   else if ('.' == asterisk[2]) {
                       /* suffix rule */
                       asterisk[1] = asterisk[2] = '\0';
  -                    uwr->worker_name = worker;
                       uwr->context = uri;
                       uwr->suffix = asterisk + 3;
                       uwr->match_type = MATCH_TYPE_SUFFIX;
  @@ -380,7 +370,6 @@
                   else if ('\0' != asterisk[2]) {
                       /* general suffix rule */
                       asterisk[1] = '\0';
  -                    uwr->worker_name = worker;
                       uwr->context = uri;
                       uwr->suffix = asterisk + 2;
                       uwr->match_type = MATCH_TYPE_GENERAL_SUFFIX;
  @@ -391,9 +380,7 @@
                   else {
                       /* context based */
                       asterisk[1] = '\0';
  -                    uwr->worker_name = worker;
                       uwr->context = uri;
  -                    uwr->suffix = NULL;
                       uwr->match_type = MATCH_TYPE_CONTEXT;
                       jk_log(l, JK_LOG_DEBUG,
                              "match rule %s=%s was added", uri, worker);
  @@ -402,9 +389,7 @@
               else {
                   /* Something like : JkMount /servlets/exampl* ajp13 */
                   uwr->uri = uri;
  -                uwr->worker_name = worker;
                   uwr->context = uri;
  -                uwr->suffix = NULL;
                   uwr->match_type = MATCH_TYPE_EXACT;
                   jk_log(l, JK_LOG_DEBUG,
                          "exact rule %s=%s was added",
  @@ -415,14 +400,13 @@
           else {
               /* Something like:  JkMount /login/j_security_check ajp13 */
               uwr->uri = uri;
  -            uwr->worker_name = worker;
               uwr->context = uri;
  -            uwr->suffix = NULL;
               uwr->match_type = MATCH_TYPE_EXACT;
               jk_log(l, JK_LOG_DEBUG,
                      "exact rule %s=%s was added",
                      uri, worker);
           }
  +        uwr->worker_name = worker;
           uwr->ctxt_len = strlen(uwr->context);
       }
       else {
  
  
  

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


Mime
View raw message