cvs: php4 /ext/curl curl.c
| From: | Jani Taskinen | Date: | Fri, 26 Jul 2002 22:57:14 +0000 |
| Subject: | cvs: php4 /ext/curl curl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13000@lists.php.net to get a copy of this message | ||
sniper Fri Jul 26 18:57:14 2002 EDT
Modified files:
/php4/ext/curl curl.c
Log:
- Fix bug: #18509, e.g. setting CURLOPT_BINARYTRANSFER succeeds always.
- Also set the binary mode ONLY if the passed value is true..
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.115 php4/ext/curl/curl.c:1.116
--- php4/ext/curl/curl.c:1.115 Wed Jul 10 22:31:38 2002
+++ php4/ext/curl/curl.c Fri Jul 26 18:57:14 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.115 2002/07/11 02:31:38 sniper Exp $ */
+/* $Id: curl.c,v 1.116 2002/07/26 22:57:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -614,9 +614,9 @@
**zoption,
**zvalue;
php_curl *ch;
- CURLcode error;
+ CURLcode error=CURLE_OK;
int option;
-
+
if (ZEND_NUM_ARGS() != 3 ||
zend_get_parameters_ex(3, &zid, &zoption, &zvalue) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -744,7 +744,10 @@
break;
case CURLOPT_BINARYTRANSFER:
convert_to_long_ex(zvalue);
- ch->handlers->write->type = PHP_CURL_BINARY;
+
+ if (Z_LVAL_PP(zvalue)) {
+ ch->handlers->write->type = PHP_CURL_BINARY;
+ }
break;
case CURLOPT_WRITEFUNCTION:
zval_add_ref(zvalue);