]> granicus.if.org Git - php/commitdiff
Fixed bug #70163 (curl_setopt_array() type confusion)
authorXinchen Hui <laruence@php.net>
Thu, 30 Jul 2015 05:40:59 +0000 (13:40 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 30 Jul 2015 05:40:59 +0000 (13:40 +0800)
NEWS
ext/curl/interface.c

diff --git a/NEWS b/NEWS
index 9c58b3a56f81c604151198dc31db76741d6b6831..c4e526a2225b2d28b2d17b5f2f49095345ae466e 100644 (file)
--- 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)
 
index 3ac13074a84e40368a598c86413c6f7f7adaea44..32ec54278f57d6c2d8533dabc9c208696a76e5d8 100644 (file)
@@ -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;
        }