com php-src: Fixed bug #70163 (curl_setopt_array() type confusion): NEWS ext/curl/interface.c
| From: | Xinchen Hui | Date: | Thu, 30 Jul 2015 05:40:59 +0000 |
| Subject: | com php-src: Fixed bug #70163 (curl_setopt_array() type confusion): NEWS ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88240@lists.php.net to get a copy of this message | ||
Commit: 6c0feb0665f3488ffdc2ab33e9e1b8d3a1af93ae
Author: Xinchen Hui <laruence@php.net> Thu, 30 Jul 2015 13:40:59 +0800
Parents: a6b47e8d68e3ad69e66ad00fe6e394cd1244a0cb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6c0feb0665f3488ffdc2ab33e9e1b8d3a1af93ae
Log:
Fixed bug #70163 (curl_setopt_array() type confusion)
Bugs:
https://bugs.php.net/70163
Changed paths:
M NEWS
M ext/curl/interface.c
Diff:
diff --git a/NEWS b/NEWS
index 9c58b3a..c4e526a 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ PHP NEWS
. Fixed bug #70164 (__COMPILER_HALT_OFFSET__ under namespace is not defined).
(Bob))
+- Curl:
+ . Fixed bug #70163 (curl_setopt_array() type confusion). (Laruence)
+
- IMAP:
. Fixed bug #70158 (Building with static imap fails). (cmb)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 3ac1307..32ec542 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2791,7 +2791,7 @@ PHP_FUNCTION(curl_setopt_array)
zend_ulong option;
zend_string *string_key;
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "za", &zid, &arr) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "ra", &zid, &arr) == FAILURE) {
return;
}