diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-12-14 15:28:27 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-12-14 15:28:27 +0300 |
| commit | c3c7b673d1f2a0503c1662936b9604290ae03ae4 (patch) | |
| tree | 4dbdf473ad525c968133b11dfb156e89f6ad46d5 /ext/opcache/ZendAccelerator.c | |
| parent | 7088cffe8a2643a28aa569c850f247b8e3c0b1e4 (diff) | |
| parent | 66e390707c664dfd645c0eb48e6602e0fdbefbd0 (diff) | |
| download | php-git-c3c7b673d1f2a0503c1662936b9604290ae03ae4.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))
Diffstat (limited to 'ext/opcache/ZendAccelerator.c')
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index abecbbf5b9..f39bc21278 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -3058,6 +3058,8 @@ static zend_result accel_post_startup(void) 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 */ |