Fixed bug #54137 (file_get_contents POST request sends additional line break).

This commit is contained in:
Ilia Alshanetsky 2011-05-29 09:23:08 +00:00
parent 6ff2f7040e
commit ef74038d1d
2 changed files with 3 additions and 1 deletions

3
NEWS
View file

@ -28,6 +28,7 @@ PHP NEWS
. Fixed a crash inside dtor for error handling. (Ilia) . Fixed a crash inside dtor for error handling. (Ilia)
. Fixed bug #54935 php_win_err can lead to crash. (Pierre) . Fixed bug #54935 php_win_err can lead to crash. (Pierre)
. Fixed bug #54924 (assert.* is not being reset upon request shutdown). (Ilia)
. Fixed bug #54895 (Fix compiling with older gcc version without need for . Fixed bug #54895 (Fix compiling with older gcc version without need for
membar_producer macro). (mhei at heimpold dot de) membar_producer macro). (mhei at heimpold dot de)
. Fixed bug #54723 (getimagesize() doesn't check the full ico signature). . Fixed bug #54723 (getimagesize() doesn't check the full ico signature).
@ -38,6 +39,8 @@ PHP NEWS
(CVE-2011-1148) (CVE-2011-1148)
. Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment). . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
(tomas dot brastavicius at quantum dot lt, Pierrick) (tomas dot brastavicius at quantum dot lt, Pierrick)
. Fixed bug #54137 (file_get_contents POST request sends additional line break).
(maurice-php at mertinkat dot net, Ilia)
. Fixed bug #54866 (incorrect accounting for realpath_cache_size) (Dustin Ward) . Fixed bug #54866 (incorrect accounting for realpath_cache_size) (Dustin Ward)
. Fixed bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) . Fixed bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size)
(Pierre, os at irj dot ru) (Pierre, os at irj dot ru)

View file

@ -631,7 +631,6 @@ finish:
} }
php_stream_write(stream, "\r\n", sizeof("\r\n")-1); php_stream_write(stream, "\r\n", sizeof("\r\n")-1);
php_stream_write(stream, Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval)); php_stream_write(stream, Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval));
php_stream_write(stream, "\r\n\r\n", sizeof("\r\n\r\n")-1);
} else { } else {
php_stream_write(stream, "\r\n", sizeof("\r\n")-1); php_stream_write(stream, "\r\n", sizeof("\r\n")-1);
} }