svn: /php/php-src/branches/PHP_5_3/ NEWS ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt
ext/standard/tests/general_functions/bug60227_2.phpt main/SAPI.c

cataphract Fri, 03 Feb 2012 08:48:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323041 Log: - Merging r323033 into 5.3 (see bug #60227). Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line header with CR(0x0D). Changed paths: U php/php-src/branches/PHP_5_3/NEWS D php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt A + php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt (from php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt:r323033) A + php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt (from php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt:r323033) U php/php-src/branches/PHP_5_3/main/SAPI.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2012-02-03 08:14:39 UTC (rev 323040) +++ php/php-src/branches/PHP_5_3/NEWS 2012-02-03 08:48:34 UTC (rev 323041) @@ -7,7 +7,7 @@ - Core: . Fixed bug #60227 (header() cannot detect the multi-line header with CR). - (rui) + (rui, Gustavo) . Fixed bug #60825 (Segfault when running symfony 2 tests). (Dmitry, Laruence) . Fix bug #60895 (Possible invalid handler usage in windows random Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt 2012-02-03 08:14:39 UTC (rev 323040) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt 2012-02-03 08:48:34 UTC (rev 323041) @@ -1,20 +0,0 @@ ---TEST-- -Bug #60227 (header() cannot detect the multi-line header with CR) ---FILE-- -<?php -header("X-Foo1: a"); -header("X-Foo2: b\n "); -header("X-Foo3: c\r\n "); -header("X-Foo4: d\r "); -header("X-Foo5: e\rSet-Cookie: ID=123"); -echo 'foo'; -?> ---EXPECTF-- -Warning: Header may not contain more than a single header, new line detected. in %s on line %d -foo ---EXPECTHEADERS-- -X-Foo1: a -X-Foo2: b -X-Foo3: c -X-Foo4: d - Copied: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt (from rev 323033, php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt) =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt 2012-02-03 08:48:34 UTC (rev 323041) @@ -0,0 +1,20 @@ +--TEST-- +Bug #60227 (header() cannot detect the multi-line header with CR) +--FILE-- +<?php +header("X-Foo1: a"); +header("X-Foo2: b\n "); +header("X-Foo3: c\r\n "); +header("X-Foo4: d\r "); +header("X-Foo5: e\rSet-Cookie: ID=123"); +echo 'foo'; +?> +--EXPECTF-- +Warning: Header may not contain more than a single header, new line detected. in %s on line %d +foo +--EXPECTHEADERS-- +X-Foo1: a +X-Foo2: b +X-Foo3: c +X-Foo4: d + Copied: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt (from rev 323033, php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt) =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt 2012-02-03 08:48:34 UTC (rev 323041) @@ -0,0 +1,14 @@ +--TEST-- +Bug #60227 (header() cannot detect the multi-line header with CR), \r before \n +--FILE-- +<?php +header("X-foo: e\n foo"); +header("X-Foo6: e\rSet-Cookie: ID=123\n d"); +echo 'foo'; +?> +--EXPECTF-- +Warning: Header may not contain more than a single header, new line detected. in %s on line %d +foo +--EXPECTHEADERS-- +X-foo: e +foo Modified: php/php-src/branches/PHP_5_3/main/SAPI.c =================================================================== --- php/php-src/branches/PHP_5_3/main/SAPI.c 2012-02-03 08:14:39 UTC (rev 323040) +++ php/php-src/branches/PHP_5_3/main/SAPI.c 2012-02-03 08:48:34 UTC (rev 323041) @@ -591,10 +591,11 @@ } } else { /* new line safety check */ - char *s = header_line, *e = header_line + header_line_len, *p; - while (s < e && ((p = memchr(s, '\n', (e - s))) || (p = memchr(s, '\r', (e - s))))) { - if (*(p + 1) == ' ' || *(p + 1) == '\t') { - s = p + 1; + char *s = header_line; + while (s = strpbrk(s, "\n\r")) { + if (s[1] == ' ' || s[1] == '\t') { + /* RFC 2616 allows new lines if followed by SP or HT */ + s++; continue; } efree(header_line);