com php-src: Merge branch 'PHP-8.0': ext/opcache/ZendAccelerator.c

From: Date: Mon, 14 Dec 2020 12:28:27 +0000
Subject: com php-src: Merge branch 'PHP-8.0': ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-114436@lists.php.net to get a copy of this message
Commit: c3c7b673d1f2a0503c1662936b9604290ae03ae4 Author: Dmitry Stogov <dmitry@zend.com> Mon, 14 Dec 2020 15:28:27 +0300 Parents: 7088cffe8a2643a28aa569c850f247b8e3c0b1e4 66e390707c664dfd645c0eb48e6602e0fdbefbd0 Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=c3c7b673d1f2a0503c1662936b9604290ae03ae4 Log: Merge branch 'PHP-8.0' * PHP-8.0: Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1)) Bugs: https://bugs.php.net/80506 Changed paths: MM ext/opcache/ZendAccelerator.c Diff: diff --cc ext/opcache/ZendAccelerator.c index abecbbf5b99,5c7f31b4879..f39bc212787 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@@ -3055,9 -3055,11 +3055,11 @@@ static zend_result accel_post_startup(v SHM_PROTECT(); } else if (!ZCG(accel_directives).file_cache) { accel_startup_ok = 0; - zend_accel_error(ACCEL_LOG_FATAL, "opcache.file_cache_only is set without a proper setting of opcache.file_cache"); + zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache_only is set without a proper setting of opcache.file_cache"); return SUCCESS; } else { + JIT_G(enabled) = 0; + JIT_G(on) = 0; accel_shared_globals = calloc(1, sizeof(zend_accel_shared_globals)); /* Init auto-global strings */

« previous php.cvs (#114436) next »