[PHP-CVS] cvs: php-src /ext/curl interface.c

[Ilia Alshanetsky]

iliaa           Tue Oct 10 23:13:13 2006 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  MFB: 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.92&r2=1.93&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.92 php-src/ext/curl/interface.c:1.93
--- php-src/ext/curl/interface.c:1.92   Sun Oct  8 22:39:48 2006
+++ php-src/ext/curl/interface.c        Tue Oct 10 23:13:13 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.92 2006/10/08 22:39:48 iliaa Exp $ */
+/* $Id: interface.c,v 1.93 2006/10/10 23:13:13 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1669,7 +1669,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;
+       }
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php