svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/http_fopen_wrapper.c branches/PHP_5_4/ext/standard/http_fopen_wrapper.c
trunk/ext/standard/http_fopen_wrapper.c

iliaa Sun, 29 May 2011 09:23:08 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311542 Log: Fixed bug #54137 (file_get_contents POST request sends additional line break). Bug: http://bugs.php.net/54137 (Open) file_get_contents POST request sends additional line breaks Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c U php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c U php/php-src/trunk/ext/standard/http_fopen_wrapper.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-05-29 07:35:10 UTC (rev 311541) +++ php/php-src/branches/PHP_5_3/NEWS 2011-05-29 09:23:08 UTC (rev 311542) @@ -28,6 +28,7 @@ . 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 @@ (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) Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-05-29 07:35:10 UTC (rev 311541) +++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-05-29 09:23:08 UTC (rev 311542) @@ -631,7 +631,6 @@ } 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); } Modified: php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c 2011-05-29 07:35:10 UTC (rev 311541) +++ php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c 2011-05-29 09:23:08 UTC (rev 311542) @@ -628,7 +628,6 @@ } 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); } Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-05-29 07:35:10 UTC (rev 311541) +++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-05-29 09:23:08 UTC (rev 311542) @@ -628,7 +628,6 @@ } 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); }