mturk 2005/02/06 10:09:03
Modified: jk/native/common jk_map.c
Log:
Allow spaces for workers.properties between property and value.
worker.foo.property = bar is now possible.
Revision Changes Path
1.26 +7 -3 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_map.c 6 Feb 2005 13:30:34 -0000 1.25
+++ jk_map.c 6 Feb 2005 18:09:03 -0000 1.26
@@ -341,6 +341,8 @@
if (v) {
*v = '\0';
v++;
+ trim(prp);
+ trim(v);
if (strlen(v) && strlen(prp)) {
const char *oldv = jk_map_get_string(m, prp, NULL);
v = jk_map_replace_properties(v, m);
@@ -452,11 +454,13 @@
{
size_t i;
- for (i = strlen(s) - 1; (i >= 0) && isspace(s[i]); i--);
+ for (i = strlen(s) - 1; (i >= 0) &&
+ isspace((int)((unsigned char)s[i])); i--);
s[i + 1] = '\0';
- for (i = 0; ('\0' != s[i]) && isspace(s[i]); i++);
+ for (i = 0; ('\0' != s[i]) &&
+ isspace((int)((unsigned char)s[i])); i++);
if (i > 0) {
strcpy(s, &s[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
