tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
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 GMT
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


Mime
View raw message