]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 17 Feb 2018 22:21:31 +0000 (23:21 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 17 Feb 2018 22:21:31 +0000 (23:21 +0100)
1  2 
ext/opcache/Optimizer/zend_func_info.c
ext/opcache/Optimizer/zend_inference.c

index 2fc6a73dd205a6f4fc9adf4bfba8f7fdc0d0d522,77502caa35aaa4b71c7f10b92adbeba88b57358b..1bcfe9fe24510d3e488212722ad74023e9679f39
@@@ -1137,9 -1032,9 +1137,9 @@@ static const func_info_t func_infos[] 
        F0("curl_multi_exec",                       MAY_BE_NULL | MAY_BE_LONG),
        FN("curl_multi_getcontent",                 MAY_BE_NULL | MAY_BE_STRING),
        F1("curl_multi_info_read",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_RESOURCE),
-       F0("curl_multi_close",                      MAY_BE_NULL),
+       F0("curl_multi_close",                      MAY_BE_NULL | MAY_BE_FALSE),
        F0("curl_multi_setopt",                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 -      F1("curl_share_init",                       MAY_BE_NULL | MAY_BE_RESOURCE),
 +      I1("curl_share_init",                       MAY_BE_RESOURCE),
        F0("curl_share_close",                      MAY_BE_NULL),
        F0("curl_share_setopt",                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("curl_file_create",                      MAY_BE_OBJECT),