diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:12:40 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:13:09 -0700 |
| commit | f1206aef701c1017a700a134f70e876e9a3754a1 (patch) | |
| tree | 5be4a12550e33eb2a9b8f0d17d2e0029f1f0084d | |
| parent | 5811610d713471a100a1a7f8ab8e00a1c4b12522 (diff) | |
| parent | 5558d0db9b88a1975b40d4beb5db863c7d87e3c0 (diff) | |
| download | php-git-f1206aef701c1017a700a134f70e876e9a3754a1.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/curl/multi.c | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -11,6 +11,10 @@ PHP NEWS height). (Gabor Buella) . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk) +- 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 e5c026a513..9fbea5518f 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -248,6 +248,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(); } /* }}} */ |