diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-20 09:07:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-20 09:07:39 +0300 |
| commit | 05c8f1ff2e34e76cfe38ae2a03d43f428fa7194e (patch) | |
| tree | 0c6d5c289001c8c1cc497f79dcba043548e8cd7d | |
| parent | 8743d5e99acd59504bdf34e65d2ba25f20d76970 (diff) | |
| parent | 35acda856a991378c2d9c22f37c62affb0d1ab8a (diff) | |
| download | php-git-05c8f1ff2e34e76cfe38ae2a03d43f428fa7194e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78185 (File cache no longer works)
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 85e0de94dd..c8f640bfeb 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1892,6 +1892,11 @@ 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; + if (file_handle->filename + && ZCG(accel_directives).file_cache + && ZCG(enabled) && accel_startup_ok) { + return file_cache_compile_file(file_handle, type); + } return accelerator_orig_compile_file(file_handle, type); } else if (file_cache_only) { ZCG(cache_opline) = NULL; |