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

diff --git a/NEWS b/NEWS
index 2cb7a5659a6f421480344c322b9c2e3f190b87e4..26e69c60e8b12fd9f0ac539ac8af20d4ae0ea828 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@ PHP                                                                        NEWS
     is_a and is_subclass_of). (alan_k) 
   . Fixed bug #60116 (escapeshellcmd() cannot escape the characters 
      which cause shell command injection). (rui)
+  . Fixed bug #60227 (header() cannot detect the multi-line header with 
+     CR(0x0D)). (rui)
  
 - Oracle Database extension (OCI8):
   . Increased maxium Oracle error message buffer length for new 11.2.0.3 size 

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 577247012b6bfaaaa7395d6bdb2e0c4712d35109..f112712b66b6978a1371f85324f142a91a649548 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -712,7 +712,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;