com php-src: Fix #66562: Consistency bug where curl_multi_g etcontent behaves different from curl_exec: ext/c url/multi.c
| From: | Stanislav Malyshev | Date: | Tue, 28 Jan 2014 10:47:14 +0000 |
| Subject: | com php-src: Fix #66562: Consistency bug where curl_multi_g etcontent behaves different from curl_exec: ext/c url/multi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76860@lists.php.net to get a copy of this message | ||
Commit: 54a6c1de7d621f97076eefeb82f0d50ce47f1223
Author: Freek <freek.lijten@procurios.nl> Tue, 28 Jan 2014 11:47:14 +0100
Parents: aafce7353eb90d6728205abc950a0197740d0cfa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54a6c1de7d621f97076eefeb82f0d50ce47f1223
Log:
Fix #66562: Consistency bug where curl_multi_getcontent behaves different 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
Bugs:
https://bugs.php.net/66562
Changed paths:
M ext/curl/multi.c
Diff:
diff --git a/ext/curl/multi..c b/ext/curl/multi.c
index e5c026a..9fbea55 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();
}
/* }}} */