From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 14 Dec 2020 12:28:27 +0000 (+0300)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3c7b673d1f2a0503c1662936b9604290ae03ae4;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))
---

c3c7b673d1f2a0503c1662936b9604290ae03ae4
diff --cc ext/opcache/ZendAccelerator.c
index abecbbf5b9,5c7f31b487..f39bc21278
--- 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 */