com php-src: Merge branch 'PHP-7.4': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_ module.c
| From: | Dmitry Stogov | Date: | Tue, 14 May 2019 12:09:30 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_ module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106186@lists.php.net to get a copy of this message | ||
Commit: 4d8e0d493a5b765b36a66baf71bc41f0c2a4fcf1
Author: Dmitry Stogov <dmitry@zend.com> Tue, 14 May 2019 15:09:30 +0300
Parents: f0eb642cb047393d4211d00c4592616bf79deb43 7bc4bd0229d792718fd8d9aef1fed710d24607b5
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=4d8e0d493a5b765b36a66baf71bc41f0c2a4fcf1
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Moved NEWS entry
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
MM ext/opcache/zend_accelerator_module.c
Diff:
diff --cc ext/opcache/ZendAccelerator.c
index 284a1b7,58baf76..9b67810
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -2382,15 -2393,12 +2384,17 @@@ int accel_activate(INIT_FUNC_ARGS
realpath_cache_clean();
accel_reset_pcre_cache();
+ ZCG(pcre_reseted) = 0;
} else if (reset_pcre) {
accel_reset_pcre_cache();
+ ZCG(pcre_reseted) = 1;
}
+
+#ifdef HAVE_JIT
+ zend_jit_activate();
+#endif
+
if (ZCSG(preload_script)) {
preload_activate();
}