com php-src: Merge branch 'PHP-8.0': ext/opcache/ZendAccelerator.c
| From: | Nikita Popov | Date: | Tue, 15 Dec 2020 08:51:51 +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-114444@lists.php.net to get a copy of this message | ||
Commit: f9942b061d980113193930b4e22b1e95bbec1c38
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 15 Dec 2020 09:51:51 +0100
Parents: b59156ca8cbfa430a936ce29de62b4b4531766bf 1e6c7e776c1f8958524d5b7af047e55108d870d2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9942b061d980113193930b4e22b1e95bbec1c38
Log:
Merge branch 'PHP-8.0'
* PHP-8.0:
JIT disabled build fix.
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff:
diff --cc ext/opcache/ZendAccelerator.c
index f39bc212787,19fc938228d..891863df615
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -3055,11 -3055,13 +3055,13 @@@ 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 {
+ #ifdef HAVE_JIT
JIT_G(enabled) = 0;
JIT_G(on) = 0;
+ #endif
accel_shared_globals = calloc(1, sizeof(zend_accel_shared_globals));
/* Init auto-global strings */