Fix #66562: Consistency bug where curl_multi_getcontent behaves diffe…

…rent from curl_exec curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent returned null. Now it returns an empty string fixing the incosistency
esr2587758 · Apr 14, 2014 · 5558d0d · 5558d0d
1 parent 636adf2
commit 5558d0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -11,6 +11,10 @@ PHP                                                                        NEWS
   . Fixed bug #67024 (getimagesize should recognize BMP files with negative 
     height). (Gabor Buella)
 
+- 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
@@ -253,6 +253,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();
 }
 /* }}} */