summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-07-30 13:40:59 +0800
committerXinchen Hui <laruence@php.net>2015-07-30 13:40:59 +0800
commit6c0feb0665f3488ffdc2ab33e9e1b8d3a1af93ae (patch)
treee8427faf421d6dc0aec7d104d672573e7d7e95d1
parenta6b47e8d68e3ad69e66ad00fe6e394cd1244a0cb (diff)
downloadphp-git-6c0feb0665f3488ffdc2ab33e9e1b8d3a1af93ae.tar.gz
Fixed bug #70163 (curl_setopt_array() type confusion)
-rw-r--r--NEWS3
-rw-r--r--ext/curl/interface.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9c58b3a56f..c4e526a222 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 3ac13074a8..32ec54278f 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;
}