diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:13:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:13:52 -0700 |
| commit | 1ef0bd2633c981f538399f4ea22fb9429bcf50e0 (patch) | |
| tree | 6878d48e0161708656f8c63a3e6a60607446fd48 | |
| parent | c1d5937f7fba1230f14af47877615c8973abf7ff (diff) | |
| parent | f1206aef701c1017a700a134f70e876e9a3754a1 (diff) | |
| download | php-git-1ef0bd2633c981f538399f4ea22fb9429bcf50e0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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
@@ -14,6 +14,10 @@ PHP NEWS . Fixed bug #67064 (Countable interface prevents using 2nd parameter ($mode) of count() function). (Bob) +- 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(); } /* }}} */ |