MFH: fixed bug #60227: header() cannot detect the multi-line header with CR.

diff --git a/NEWS b/NEWS
index 04d1a8350c34053b06514c3700528e25c5472e83..2f74c6ed4d4af2629a6f2f57675624371bf58d83 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ?? 2012, PHP 5.3.10
+
+- Core:
+ . fixed bug #60227: header() cannot detect the multi-line header with CR (rui).
+
 10 Jan 2012, PHP 5.3.9
 
 - Core:

diff --git a/ext/standard/tests/general_functions/bug60227.phpt b/ext/standard/tests/general_functions/bug60227.phpt
new file mode 100644 (file)
index 0000000..f95a061
--- /dev/null
+++ b/ext/standard/tests/general_functions/bug60227.phpt
@@ -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
+

diff --git a/main/SAPI.c b/main/SAPI.c
index 92e3d0874dabb33696f490a10a1bdd83a28bde8e..154ab6bf29f2a9c5f0e1347af20ac5180a98cb86 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -592,7 +592,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
        } 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;