Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 68521 invoked from network); 21 Jul 2006 14:42:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Jul 2006 14:42:30 -0000 Received: (qmail 77559 invoked by uid 500); 21 Jul 2006 14:42:09 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 77514 invoked by uid 500); 21 Jul 2006 14:42:09 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 77497 invoked by uid 500); 21 Jul 2006 14:42:09 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 77485 invoked by uid 99); 21 Jul 2006 14:42:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 07:42:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 07:42:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4CFA21A981A; Fri, 21 Jul 2006 07:41:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r424335 - in /tomcat/connectors/trunk/jk/native/common: jk_map.c jk_uri_worker_map.c Date: Fri, 21 Jul 2006 14:41:47 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060721144148.4CFA21A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Fri Jul 21 07:41:47 2006 New Revision: 424335 URL: http://svn.apache.org/viewvc?rev=424335&view=rev Log: Fix #40087 by using case sensitive maps like it was with <= 1.2.6. The regression is that the worker names must be case sensitive, again as they were with 1.2.6 Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=424335&r1=424334&r2=424335&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_map.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_map.c Fri Jul 21 07:41:47 2006 @@ -145,7 +145,7 @@ unsigned int key; COMPUTE_KEY_CHECKSUM(name, key) for (i = 0; i < m->size; i++) { - if (m->keys[i] == key && strcasecmp(m->names[i], name) == 0) { + if (m->keys[i] == key && strcmp(m->names[i], name) == 0) { rc = m->values[i]; break; } @@ -163,7 +163,7 @@ unsigned int key; COMPUTE_KEY_CHECKSUM(name, key) for (i = 0; i < m->size; i++) { - if (m->keys[i] == key && strcasecmp(m->names[i], name) == 0) { + if (m->keys[i] == key && strcmp(m->names[i], name) == 0) { rc = i; break; } @@ -182,7 +182,7 @@ unsigned int key; COMPUTE_KEY_CHECKSUM(name, key) for (i = 0; i < m->size; i++) { - if (m->keys[i] == key && strcasecmp(m->names[i], name) == 0) { + if (m->keys[i] == key && strcmp(m->names[i], name) == 0) { rc = m->values[i]; break; } Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=424335&r1=424334&r2=424335&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Fri Jul 21 07:41:47 2006 @@ -440,7 +440,7 @@ /* Map is already sorted by context_len */ if (wildchar_match(uri, uwr->context, #ifdef WIN32 - 1 + 0 #else 0 #endif @@ -529,7 +529,7 @@ /* Map is already sorted by context_len */ if (wildchar_match(url, uwr->context, #ifdef WIN32 - 1 + 0 #else 0 #endif --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org