From 61088ce7296f2a3b4b53e60bdf413455b870664d Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sat, 14 Jan 2012 07:41:01 +0000 Subject: [PATCH] MFH: fixed bug #60227: header() cannot detect the multi-line header with CR. --- NEWS | 5 +++++ .../tests/general_functions/bug60227.phpt | 20 +++++++++++++++++++ main/SAPI.c | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ext/standard/tests/general_functions/bug60227.phpt diff --git a/NEWS b/NEWS index 04d1a8350c..2f74c6ed4d 100644 --- 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 index 0000000000..f95a061d2c --- /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-- + +--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 92e3d0874d..154ab6bf29 100644 --- 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; -- 2.40.0