summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-06-20 09:04:14 +0300
committerRemi Collet <remi@php.net>2019-06-20 10:38:15 +0200
commitd51108d5df7868ec53257bcd7131886a52af1c1f (patch)
tree68621110fbc507283ff439c80fcffcd76d08cd5a
parent9fbab5689688593d654eb584effb5f2d0b6dca64 (diff)
downloadphp-git-d51108d5df7868ec53257bcd7131886a52af1c1f.tar.gz
Fixed bug #78185 (File cache no longer works)
(cherry picked from commit cd6a6e4cf2677bfbe2a21164239737eb22bd4da6)
-rw-r--r--ext/opcache/ZendAccelerator.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 70508b6b05..b6c001d637 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1772,6 +1772,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) {