Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 43138 invoked from network); 12 Feb 2005 19:29:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Feb 2005 19:29:17 -0000 Received: (qmail 97194 invoked by uid 500); 12 Feb 2005 19:29:10 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 97129 invoked by uid 500); 12 Feb 2005 19:29:10 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 97116 invoked by uid 500); 12 Feb 2005 19:29:10 -0000 Received: (qmail 97112 invoked by uid 99); 12 Feb 2005 19:29:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 12 Feb 2005 11:29:09 -0800 Received: (qmail 43090 invoked by uid 1526); 12 Feb 2005 19:29:08 -0000 Date: 12 Feb 2005 19:29:08 -0000 Message-ID: <20050212192908.43089.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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