Hi James,
I committed a patch for the problem. If you are able to compile the
plugin, you can check out the file from subversion, or apply the
following patch to version 1.2.19. Check for split mail lines in the patch.
Regards,
Rainer
Index: native/common/jk_map.c
===================================================================
--- native/common/jk_map.c (revision 439824)
+++ native/common/jk_map.c (revision 469665)
@@ -35,17 +35,11 @@
#define JK_MAP_REFERENCE (".reference")
#define JK_MAP_REFERENCE_SZ (strlen(JK_MAP_REFERENCE))
-#ifdef AS400
-#define CASE_MASK 0xbfbfbfbf
-#else
-#define CASE_MASK 0xdfdfdfdf
-#endif
-
/* Compute the "checksum" for a key, consisting of the first
- * 4 bytes, normalized for case-insensitivity and packed into
- * an int...this checksum allows us to do a single integer
+ * 4 bytes, packed into an int.
+ * This checksum allows us to do a single integer
* comparison as a fast check to determine whether we can
- * skip a strcasecmp
+ * skip a strcmp
*/
#define COMPUTE_KEY_CHECKSUM(key, checksum) \
{ \
@@ -67,7 +61,6 @@
c = (unsigned int)*++k; \
checksum |= c; \
} \
- checksum &= CASE_MASK; \
}
struct jk_map
@@ -342,7 +335,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) {
break;
}
}
@@ -661,7 +654,7 @@
*(to+remain) = '.';
*(to+remain+1) = '\0';
- rc = jk_map_resolve_references(m, m->values[i],
0, ++depth, l);
+ rc = jk_map_resolve_references(m, m->values[i],
0, depth+1, l);
if (rc == JK_FALSE) {
break;
}
---------------------------------------------------------------------
To start a new topic, e-mail: users@tomcat.apache.org
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
