]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorDmitry Stogov <dmitry@zend.com>
Mon, 14 Dec 2020 12:28:27 +0000 (15:28 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 14 Dec 2020 12:28:27 +0000 (15:28 +0300)
* PHP-8.0:
  Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))

1  2 
ext/opcache/ZendAccelerator.c

index abecbbf5b99a6b889a7960e8e6dafb4effeabfe2,5c7f31b4879b32644ca784071da8295576f55822..f39bc2127879f92344a0e2757d5abb60b9da1e41
@@@ -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 */