From: Nikita Popov Date: Sat, 17 Feb 2018 22:21:31 +0000 (+0100) Subject: Merge branch 'PHP-7.2' X-Git-Tag: php-7.3.0alpha1~379 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cd40b3aede9d227002ebb705fdc1c1685909ba5;p=php Merge branch 'PHP-7.2' --- 2cd40b3aede9d227002ebb705fdc1c1685909ba5 diff --cc ext/opcache/Optimizer/zend_func_info.c index 2fc6a73dd2,77502caa35..1bcfe9fe24 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@@ -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),