iliaa Mon Jun 15 12:37:37 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: Simplify original fix for bug #33475 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.56&r2=1.62.2.14.2.27.2.57&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56 Fri Jun 12 20:48:28 2009 +++ php-src/ext/curl/interface.c Mon Jun 15 12:37:37 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.56 2009/06/12 20:48:28 felipe Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.57 2009/06/15 12:37:37 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -2047,14 +2047,11 @@ RETURN_FALSE; } - ch->uses++; - if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.len > 0) { - --ch->uses; smart_str_0(&ch->handlers->write->buf); RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1); } - --ch->uses; + if (ch->handlers->write->method == PHP_CURL_RETURN) { RETURN_EMPTY_STRING(); } else {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php