com php-src: Fix #66562: Consistency bug where curl_multi_g etcontent behaves different from curl_exec: NEWS ext/curl/multi.c

Commit: 5558d0db9b88a1975b40d4beb5db863c7d87e3c0 Author: Freek <freek.lijten@procurios.nl> Tue, 28 Jan 2014 11:47:14 +0100 Committer: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 18:12:17 -0700 Parents: 636adf251c80884c151cb233bbdae1497fdadc4a Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5558d0db9b88a1975b40d4beb5db863c7d87e3c0 Log: Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent returned null. Now it returns an empty string fixing the incosistency Bugs: https://bugs.php.net/66562 Changed paths: M NEWS M ext/curl/multi.c Diff: diff --git a/NEWS b/NEWS index a059e07..c6522ae 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,10 @@ PHP NEWS . Fixed bug #67024 (getimagesize should recognize BMP files with negative height). (Gabor Buella) +- cURL: + . Fixed bug #66562 (curl_exec returns differently than curl_multi_getcontent). + (Freek Lijten) + - Date: . Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is supplied). (Boro Sitnikovski) diff --git a/ext/curl/multi.c b/ext/curl/multi.c index a990dad..c0985e5 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -253,6 +253,8 @@ PHP_FUNCTION(curl_multi_getcontent) smart_str_0(&ch->handlers->write->buf); RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1); } + + RETURN_EMPTY_STRING(); } /* }}} */