Merge branch '3.0'

This commit is contained in:
terrafrost 2023-11-24 06:01:54 -06:00
commit f62b5f832e

View File

@ -1242,7 +1242,8 @@ abstract class PHP extends Engine
*/ */
protected static function testJITOnWindows() protected static function testJITOnWindows()
{ {
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && !defined('PHPSECLIB_ALLOW_JIT')) { // see https://github.com/php/php-src/issues/11917
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && PHP_VERSION_ID < 80213 && !defined('PHPSECLIB_ALLOW_JIT')) {
$status = opcache_get_status(); $status = opcache_get_status();
if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) { if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
return true; return true;