From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 20 Jun 2019 06:07:39 +0000 (+0300)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05c8f1ff2e34e76cfe38ae2a03d43f428fa7194e;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78185 (File cache no longer works)
---

05c8f1ff2e34e76cfe38ae2a03d43f428fa7194e
diff --cc ext/opcache/ZendAccelerator.c
index 85e0de94dd,4baa779aea..c8f640bfeb
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1892,7 -1918,15 +1892,12 @@@ zend_op_array *persistent_compile_file(
  		/* 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) {
  		ZCG(cache_opline) = NULL;
  		ZCG(cache_persistent_script) = NULL;