You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.8 KiB
42 lines
1.8 KiB
6 years ago
|
--- a/modules/loggers/mod_log_config.c 2013/11/15 17:07:52 1542329
|
||
|
|
+++ b/modules/loggers/mod_log_config.c 2014/03/10 11:23:47 1575904
|
||
|
|
@@ -543,14 +543,24 @@
|
||
|
|
|
||
|
|
while ((cookie = apr_strtok(cookies, ";", &last1))) {
|
||
|
|
char *name = apr_strtok(cookie, "=", &last2);
|
||
|
|
- if (name) {
|
||
|
|
- char *value = name + strlen(name) + 1;
|
||
|
|
- apr_collapse_spaces(name, name);
|
||
|
|
+ /* last2 points to the next char following an '=' delim,
|
||
|
|
+ or the trailing NUL char of the string */
|
||
|
|
+ char *value = last2;
|
||
|
|
+ if (name && *name && value && *value) {
|
||
|
|
+ char *last = value - 2;
|
||
|
|
+ /* Move past leading WS */
|
||
|
|
+ name += strspn(name, " \t");
|
||
|
|
+ while (last >= name && apr_isspace(*last)) {
|
||
|
|
+ *last = '\0';
|
||
|
|
+ --last;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (!strcasecmp(name, a)) {
|
||
|
|
- char *last;
|
||
|
|
- value += strspn(value, " \t"); /* Move past leading WS */
|
||
|
|
- last = value + strlen(value) - 1;
|
||
|
|
+ /* last1 points to the next char following the ';' delim,
|
||
|
|
+ or the trailing NUL char of the string */
|
||
|
|
+ last = last1 - (*last1 ? 2 : 1);
|
||
|
|
+ /* Move past leading WS */
|
||
|
|
+ value += strspn(value, " \t");
|
||
|
|
while (last >= value && apr_isspace(*last)) {
|
||
|
|
*last = '\0';
|
||
|
|
--last;
|
||
|
|
@@ -559,6 +569,7 @@
|
||
|
|
return ap_escape_logitem(r->pool, value);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ /* Iterate the remaining tokens using apr_strtok(NULL, ...) */
|
||
|
|
cookies = NULL;
|
||
|
|
}
|
||
|
|
}
|