summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-05-29 09:23:08 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-05-29 09:23:08 +0000
commitef74038d1d681cce8b49e5d15897fc9abfeca88e (patch)
treef7a3498b440d1ded8db0c70759c45750c7a0c780
parent6ff2f7040ef8c2295bf6531e5bc34773ad6af154 (diff)
downloadphp-git-ef74038d1d681cce8b49e5d15897fc9abfeca88e.tar.gz
Fixed bug #54137 (file_get_contents POST request sends additional line break).
-rw-r--r--NEWS3
-rw-r--r--ext/standard/http_fopen_wrapper.c1
2 files changed, 3 insertions, 1 deletions
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);
}