From cda114a3c19c8f1f525eee7764818fea5a4a7c97 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Fri, 7 Mar 2014 20:45:33 +0000 Subject: [PATCH] Revert r1574518 to get 2.2/2.4/2.x all back in sync for a single fix git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575394 13f79535-47bb-0310-9956-ffa450edef68 --- modules/loggers/mod_log_config.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 0ccf23f8731..5e666ed4089 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -542,9 +542,8 @@ static const char *log_cookie(request_rec *r, char *a) char *cookies = apr_pstrdup(r->pool, cookies_entry); while ((cookie = apr_strtok(cookies, ";", &last1))) { - char *name; - if (strchr(cookie, '=') && - (name = apr_strtok(cookie, "=", &last2)) != NULL) { + char *name = apr_strtok(cookie, "=", &last2); + if (name) { char *value = name + strlen(name) + 1; apr_collapse_spaces(name, name); -- 2.47.3