Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78185 (File cache no longer works)
This commit is contained in:
Dmitry Stogov 2019-06-20 09:07:39 +03:00
commit 05c8f1ff2e

View File

@ -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 */ /* The Accelerator is disabled, act as if without the Accelerator */
ZCG(cache_opline) = NULL; ZCG(cache_opline) = NULL;
ZCG(cache_persistent_script) = 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); return accelerator_orig_compile_file(file_handle, type);
} else if (file_cache_only) { } else if (file_cache_only) {
ZCG(cache_opline) = NULL; ZCG(cache_opline) = NULL;