iliaa Tue Oct 10 23:13:00 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-src NEWS
Log:
Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
files).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.11&r2=1.62.2.14.2.12&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.11
php-src/ext/curl/interface.c:1.62.2.14.2.12
--- php-src/ext/curl/interface.c:1.62.2.14.2.11 Sun Oct 8 22:38:48 2006
+++ php-src/ext/curl/interface.c Tue Oct 10 23:12:59 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.11 2006/10/08 22:38:48 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.12 2006/10/10 23:12:59 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1671,7 +1671,11 @@
RETURN_STRINGL(ch->handlers->write->buf.c,
ch->handlers->write->buf.len, 1);
}
--ch->uses;
- RETURN_TRUE;
+ if (ch->handlers->write->method == PHP_CURL_RETURN) {
+ RETURN_EMPTY_STRING();
+ } else {
+ RETURN_TRUE;
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.297&r2=1.2027.2.547.2.298&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.297 php-src/NEWS:1.2027.2.547.2.298
--- php-src/NEWS:1.2027.2.547.2.297 Tue Oct 10 17:32:50 2006
+++ php-src/NEWS Tue Oct 10 23:12:59 2006
@@ -4,6 +4,8 @@
- Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one
piecewise column) (jeff at badtz-maru dot com, Tony)
- Fixed bug #39067 (getDeclaringClass() and private properties). (Tony)
+- Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
+ files). (Ilia)
- Fixed bug #38198 (possible crash when COM reports an exception). (Ilia)
- Fixed bug #37262 (var_export() does not escape \0 character). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
