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

diff --cc NEWS
index 9f11dcbb99628ddf33f1db58b44afe4027d688c4,c6522aea91d7f3f2c86e85c1c3227b639a5e939d..6ba540bae97d7848edcfc0c326b48d3fa2b6c5aa
--- 1/NEWS
--- 2/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)

diff --cc ext/curl/multi.c
Simple merge