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

diff --git a/NEWS b/NEWS
index a77e7f4f124fcf838907e48b1c1fee37017444de..f2327d8671f9f030f75632a58e2588db6e19a44a 100644 (file)
--- 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 7a930fd7ab915422d675dcf04edf0ee79f5316b2..8769a3d296ad3bbf6889078b50896269320e750f 100644 (file)
--- 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);
        }