com php-src: Merge branch 'pull-request/728': ext/curl/multi.c

From: Date: Mon, 01 Dec 2014 06:22:15 +0000
Subject: com php-src: Merge branch 'pull-request/728': ext/curl/multi.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83436@lists.php.net to get a copy of this message
Commit: 8b2a8c46b0653ff239a345d63efa8fc62dbbc649 Author: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 22:22:15 -0800 Parents: bfc8d297be96b10f82190e58d8de67e101c33573 00c6033f99f9e4303e273bb5393efbadbb7c43a9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b2a8c46b0653ff239a345d63efa8fc62dbbc649 Log: Merge branch 'pull-request/728' * pull-request/728: Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set) Conflicts: ext/curl/multi.c Bugs: https://bugs.php.net/67643 Changed paths: MM ext/curl/multi.c Diff: diff --cc ext/curl/multi.c index d9e6df2,0c21fe1..d9ace41 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@@ -238,14 -242,17 +238,17 @@@ PHP_FUNCTION(curl_multi_getcontent return; } - ZEND_FETCH_RESOURCE(ch, php_curl *, &z_ch, -1, le_curl_name, le_curl); + ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl); - if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.s) { + if (ch->handlers->write->method == PHP_CURL_RETURN) { - if (ch->handlers->write->buf.len == 0) { ++ if (!ch->handlers->write->buf.s) { + RETURN_EMPTY_STRING(); + } smart_str_0(&ch->handlers->write->buf); - RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1); + RETURN_STR(zend_string_copy(ch->handlers->write->buf.s)); } - RETURN_EMPTY_STRING(); + RETURN_NULL(); } /* }}} */

« previous php.cvs (#83436) next »