com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/curl/multi.c

Commit: f1206aef701c1017a700a134f70e876e9a3754a1 Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 18:12:40 -0700 Parents: 5811610d713471a100a1a7f8ab8e00a1c4b12522 5558d0db9b88a1975b40d4beb5db863c7d87e3c0 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1206aef701c1017a700a134f70e876e9a3754a1 Log: 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 Bugs: https://bugs.php.net/66562 Changed paths: MM NEWS MM ext/curl/multi.c Diff: diff --cc NEWS index 9f11dcb,c6522ae..6ba540b --- a/NEWS +++ b/NEWS @@@ -5,12 -6,15 +5,16 @@@ PH . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike) . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace UNIX sockets). (Mike) - . Fixed bug #66182 (exit in stream filter produces segfault). (Mike) + . Fixed bug #66182 (exit in stream filter produces segfault). (Mike) . Fixed bug #66736 (fpassthru broken). (Mike) - . Fixed bug #67024 (getimagesize should recognize BMP files with negative + . Fixed bug #67024 (getimagesize should recognize BMP files with negative 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)