From ef74038d1d681cce8b49e5d15897fc9abfeca88e Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sun, 29 May 2011 09:23:08 +0000 Subject: [PATCH] Fixed bug #54137 (file_get_contents POST request sends additional line break). --- NEWS | 3 +++ ext/standard/http_fopen_wrapper.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a77e7f4f12..f2327d8671 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,7 @@ PHP NEWS . Fixed a crash inside dtor for error handling. (Ilia) . 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 membar_producer macro). (mhei at heimpold dot de) . Fixed bug #54723 (getimagesize() doesn't check the full ico signature). @@ -38,6 +39,8 @@ PHP NEWS (CVE-2011-1148) . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment). (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 #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) (Pierre, os at irj dot ru) diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 7a930fd7ab..8769a3d296 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -631,7 +631,6 @@ finish: } 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, "\r\n\r\n", sizeof("\r\n\r\n")-1); } else { php_stream_write(stream, "\r\n", sizeof("\r\n")-1); } -- 2.40.0