diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-26 11:13:49 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-26 11:13:49 +0200 |
| commit | e4ecadcb626d00feb5df17d66a43cabc0b440560 (patch) | |
| tree | 56cd4c08f126b252cae1532b883e433972765054 /ext | |
| parent | a26f63213d29b85bf44e22163ddb0b735623617f (diff) | |
| parent | 1e82a2d659aac6ef95a6820d4f6ac3684e07bcad (diff) | |
| download | php-git-e4ecadcb626d00feb5df17d66a43cabc0b440560.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/Optimizer/zend_func_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index bdb248d6fd..78ad60fa13 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -274,7 +274,7 @@ static const func_info_t func_infos[] = { F0("sleep", MAY_BE_FALSE | MAY_BE_LONG), F0("usleep", MAY_BE_NULL | MAY_BE_FALSE), #if HAVE_NANOSLEEP - F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG), F0("time_sleep_until", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_STRPTIME @@ -401,7 +401,7 @@ static const func_info_t func_infos[] = { F1("system", MAY_BE_FALSE | MAY_BE_STRING), F1("escapeshellcmd", MAY_BE_NULL | MAY_BE_STRING), F1("escapeshellarg", MAY_BE_NULL | MAY_BE_STRING), - F1("passthru", MAY_BE_FALSE | MAY_BE_STRING), + F1("passthru", MAY_BE_NULL | MAY_BE_FALSE), F1("shell_exec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #ifdef PHP_CAN_SUPPORT_PROC_OPEN F1("proc_open", MAY_BE_FALSE | MAY_BE_RESOURCE), |