cvs: php-src(PHP_4_3) /ext/curl curl.c
| From: | Rasmus Lerdorf | Date: | Tue, 09 Mar 2004 17:06:55 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/curl curl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26573@lists.php.net to get a copy of this message | ||
rasmus Tue Mar 9 12:06:55 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/curl curl.c
Log:
Make curl_setopt($ch,CURLOPT_RETURNTRANSFER,0) reset the RETURNTRANSFER to
stdout as is implied in the documentation. Currently it simply does
absolutely nothing and there is no way to reset it to stdout.
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.16&r2=1.124.2.17&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.16 php-src/ext/curl/curl.c:1.124.2.17
--- php-src/ext/curl/curl.c:1.124.2.16 Mon Feb 23 14:50:47 2004
+++ php-src/ext/curl/curl.c Tue Mar 9 12:06:53 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.16 2004/02/23 19:50:47 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.17 2004/03/09 17:06:53 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -802,7 +802,9 @@
if (Z_LVAL_PP(zvalue)) {
ch->handlers->write->method = PHP_CURL_RETURN;
- }
+ } else {
+ ch->handlers->write->method = PHP_CURL_STDOUT;
+ }
break;
case CURLOPT_BINARYTRANSFER:
convert_to_long_ex(zvalue);