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

NEWS

@@ -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)

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();
 }
 /* }}} */