svn: /php/php-src/trunk/ ext/standard/tests/general_functions/bug60227.phpt main/SAPI.c
| From: | Rui Hirokawa | Date: | Sun, 06 Nov 2011 11:07:14 +0000 |
| Subject: | svn: /php/php-src/trunk/ ext/standard/tests/general_functions/bug60227.phpt main/SAPI.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66901@lists.php.net to get a copy of this message | ||
hirokawa Sun, 06 Nov 2011 11:07:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=318820
Log:
fixed bug #60227: header() cannot detect the multi-line header with CR.
Bug: https://bugs.php.net/60227 (Open) header() cannot
detect the multi-line header with CR(0x0D).
Changed paths:
A php/php-src/trunk/ext/standard/tests/general_functions/bug60227.phpt
U php/php-src/trunk/main/SAPI.c
Added: php/php-src/trunk/ext/standard/tests/general_functions/bug60227.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/bug60227.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug60227.phpt 2011-11-06 11:07:14 UTC
(rev 318820)
@@ -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
+
Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/bug60227.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/main/SAPI.c
===================================================================
--- php/php-src/trunk/main/SAPI.c 2011-11-06 07:41:04 UTC (rev 318819)
+++ php/php-src/trunk/main/SAPI.c 2011-11-06 11:07:14 UTC (rev 318820)
@@ -712,7 +712,7 @@
} 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)))) {
+ while (s < e && ((p = memchr(s, '\n', (e - s))) || (p = memchr(s,
'\r', (e - s))))) {
if (*(p + 1) == ' ' || *(p + 1) == '\t') {
s = p + 1;
continue;