Author: rjung
Date: Sat Aug 18 09:32:36 2012
New Revision: 1374538
URL: http://svn.apache.org/viewvc?rev=1374538&view=rev
Log:
mod_log_config: %{abc}C truncates cookies whose values contain '='.
PR 53104
Backport of r1328133 from trunk resp. r1359690 from 2.4.
Submitted by: gregames
Reviewed by: trawick, wrowe
Backported by: rjung
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1328133
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1374538&r1=1374537&r2=1374538&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Aug 18 09:32:36 2012
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
possible XSS for a site where untrusted users can upload files to
a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
+ *) mod_log_config: Fix %{abc}C truncating cookie values at first "=".
+ PR 53104. [Greg Ames]
+
*) Unix MPMs: Fix small memory leak in parent process if connect()
failed when waking up children. [Joe Orton]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1374538&r1=1374537&r2=1374538&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Aug 18 09:32:36 2012
@@ -93,12 +93,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_log_config: %{abc}C truncates cookies whose values contain '='
- PR 53104
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1328133
- 2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1359690
- 2.2.x patch: trunk patch applies
- +1: rjung, trawick, wrowe
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c?rev=1374538&r1=1374537&r2=1374538&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c Sat Aug 18 09:32:36 2012
@@ -525,10 +525,10 @@ static const char *log_cookie(request_re
while ((cookie = apr_strtok(cookies, ";", &last1))) {
char *name = apr_strtok(cookie, "=", &last2);
if (name) {
- char *value;
+ char *value = name + strlen(name) + 1;
apr_collapse_spaces(name, name);
- if (!strcasecmp(name, a) && (value = apr_strtok(NULL, "=", &last2))) {
+ if (!strcasecmp(name, a)) {
char *last;
value += strspn(value, " \t"); /* Move past leading WS */
last = value + strlen(value) - 1;