diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-20 09:05:50 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-20 09:05:50 +0300 |
| commit | 35acda856a991378c2d9c22f37c62affb0d1ab8a (patch) | |
| tree | c14c1c0f53bb1ffc6fa9401c635884e90a513514 | |
| parent | 7ba1e6b34d9b79b2fadd0f6c041ea71d35bd5d23 (diff) | |
| parent | cd6a6e4cf2677bfbe2a21164239737eb22bd4da6 (diff) | |
| download | php-git-35acda856a991378c2d9c22f37c62affb0d1ab8a.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78185 (File cache no longer works)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -8,6 +8,9 @@ PHP NEWS - Date: . Fixed #69044 (discrepency between time and microtime). (krakjoe) +- Opcache: + . Fixed bug #78185 (File cache no longer works). (Dmitry) + 27 Jun 2019, PHP 7.3.7 - Core: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 8ba242723d..4baa779aea 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1918,6 +1918,13 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type) /* The Accelerator is disabled, act as if without the Accelerator */ ZCG(cache_opline) = NULL; ZCG(cache_persistent_script) = NULL; +#ifdef HAVE_OPCACHE_FILE_CACHE + if (file_handle->filename + && ZCG(accel_directives).file_cache + && ZCG(enabled) && accel_startup_ok) { + return file_cache_compile_file(file_handle, type); + } +#endif return accelerator_orig_compile_file(file_handle, type); #ifdef HAVE_OPCACHE_FILE_CACHE } else if (file_cache_only) { |