iliaa Tue Oct 10 23:17:05 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/ext/curl curl.c
Log:
MFH: Fixed bug #39034 (curl_exec() with return transfer returns TRUE on
empty files).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.166&r2=1.1247.2.920.2.167&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.166 php-src/NEWS:1.1247.2.920.2.167
--- php-src/NEWS:1.1247.2.920.2.166 Wed Oct 4 23:20:02 2006
+++ php-src/NEWS Tue Oct 10 23:17:04 2006
@@ -3,6 +3,8 @@
?? ??? 2006, Version 4.4.5
- Updated PCRE to version 6.7. (Ilia)
- Fixed missing open_basedir check inside chdir() function. (Ilia)
+- Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
+ files). (Ilia)
- Fixed bug #38963 (Fixed a possible open_basedir bypass in tempnam()). (Ilia)
- Fixed bug #38859 (parse_url() fails if passing '@' in passwd). (Tony,Ilia)
- Fixed bug #38534 (segfault when calling setlocale() in userspace session
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/curl.c?r1=1.124.2.30.2.12&r2=1.124.2.30.2.13&diff_format=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.30.2.12
php-src/ext/curl/curl.c:1.124.2.30.2.13
--- php-src/ext/curl/curl.c:1.124.2.30.2.12 Thu Aug 10 17:27:11 2006
+++ php-src/ext/curl/curl.c Tue Oct 10 23:17:05 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.30.2.12 2006/08/10 17:27:11 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.30.2.13 2006/10/10 23:17:05 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1299,6 +1299,8 @@
if (ch->handlers->write->type != PHP_CURL_BINARY)
smart_str_0(&ch->handlers->write->buf);
RETURN_STRINGL(ch->handlers->write->buf.c,
ch->handlers->write->buf.len, 0);
+ } else if (ch->handlers->write->method == PHP_CURL_RETURN) {
+ RETURN_STRINGL("", sizeof("") - 1, 0);
}
RETURN_TRUE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
