summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-06-20 09:04:14 +0300
committerChristoph M. Becker <cmbecker69@gmx.de>2019-06-20 12:22:53 +0200
commit525c80ec74305f49545ee109f47fdfa495b24aee (patch)
tree2d50ca47578a8e5b116280dfd4d9a9ea3182941b
parent770db7e68c62126d6ff9010eb650344716d2825d (diff)
downloadphp-git-525c80ec74305f49545ee109f47fdfa495b24aee.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 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) {