com php-src: Update header handling to RFC 7230: ext/standard/t ests/general_functions/bug60227_2.phpt ext/
standard/tests/general_functions/bug60227_3.p hpt ext/standard/tests/general_functions/bug60227 _4.phpt main/SAPI.c

From: Date: Fri, 06 Feb 2015 04:10:28 +0000
Subject: com php-src: Update header handling to RFC 7230: ext/standard/t ests/general_functions/bug60227_2.phpt ext/
standard/tests/general_functions/bug60227_3.p hpt ext/standard/tests/general_functions/bug60227 _4.phpt main/SAPI.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84672@lists.php.net to get a copy of this message
Commit: c3eac70c76f923147b3dc336e43f3451b2eeabb8 Author: Stanislav Malyshev <stas@php.net> Wed, 4 Feb 2015 01:11:00 -0800 Parents: e82e22e27bd81027ea3a92ab6a34f31727049b1e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3eac70c76f923147b3dc336e43f3451b2eeabb8 Log: Update header handling to RFC 7230 Changed paths: M ext/standard/tests/general_functions/bug60227_2.phpt M ext/standard/tests/general_functions/bug60227_3.phpt M ext/standard/tests/general_functions/bug60227_4.phpt M main/SAPI.c Diff: diff --git a/ext/standard/tests/general_functions/bug60227_2.phpt b/ext/standard/tests/general_functions/bug60227_2.phpt index 995c364..2cdde78 100644 --- a/ext/standard/tests/general_functions/bug60227_2.phpt +++ b/ext/standard/tests/general_functions/bug60227_2.phpt @@ -1,14 +1,15 @@ --TEST-- Bug #60227 (header() cannot detect the multi-line header with CR), \r before \n +--INI-- +expose_php=0 --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 +Content-type: text/html; charset=UTF-8 diff --git a/ext/standard/tests/general_functions/bug60227_3.phpt b/ext/standard/tests/general_functions/bug60227_3.phpt index 8cba9b8..8246f17 100644 --- a/ext/standard/tests/general_functions/bug60227_3.phpt +++ b/ext/standard/tests/general_functions/bug60227_3.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #60227 (header() cannot detect the multi-line header with CR), \0 before \n +--INI-- +expose_php=0 --FILE-- <?php -header("X-foo: e\n foo"); header("X-Foo6: e\0Set-Cookie: ID=\n123\n d"); echo 'foo'; ?> @@ -10,5 +11,4 @@ echo 'foo'; Warning: Header may not contain NUL bytes in %s on line %d foo --EXPECTHEADERS-- -X-foo: e -foo +Content-type: text/html; charset=UTF-8 diff --git a/ext/standard/tests/general_functions/bug60227_4.phpt b/ext/standard/tests/general_functions/bug60227_4.phpt index d5e2573..20dba1a 100644 --- a/ext/standard/tests/general_functions/bug60227_4.phpt +++ b/ext/standard/tests/general_functions/bug60227_4.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #60227 (header() cannot detect the multi-line header with CR), CRLF +--INI-- +expose_php=0 --FILE-- <?php -header("X-foo: e\r\n foo"); header("X-foo: e\r\nfoo"); echo 'foo'; ?> @@ -10,5 +11,4 @@ echo 'foo'; Warning: Header may not contain more than a single header, new line detected in %s on line %d foo --EXPECTHEADERS-- -X-foo: e - foo +Content-type: text/html; charset=UTF-8 diff --git a/main/SAPI.c b/main/SAPI.c index 0106448..6a41059 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -744,13 +744,8 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg) /* new line/NUL character safety check */ uint i; for (i = 0; i < header_line_len; i++) { - /* RFC 2616 allows new lines if followed by SP or HT */ - int illegal_break = - (header_line[i+1] != ' ' && header_line[i+1] != '\t') - && ( - header_line[i] == '\n' - || (header_line[i] == '\r' && header_line[i+1] != '\n')); - if (illegal_break) { + /* RFC 7230 ch. 3.2.4 deprecates folding support */ + if (header_line[i] == '\n' || header_line[i] == '\r') { efree(header_line); sapi_module.sapi_error(E_WARNING, "Header may not contain " "more than a single header, new line detected");

« previous php.cvs (#84672) next »