Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.

diff --cc ext/opcache/ZendAccelerator.c
index 785f36256b6ba19ea98c82f1cff7506bc0f0c77b,11b2c4ea778272f6e0edc205fd6b99c3a2b9e919..e66b39ca63b42eda9aad7493c72033b379e73d80
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -2773,19 -2956,28 +2781,19 @@@ void accel_shutdown(void
                return;
        }
  
 -      if (ZCG(accel_directives).interned_strings_buffer) {
 -#ifndef ZTS
 -              zend_hash_clean(CG(auto_globals));
 -              zend_hash_clean(CG(function_table));
 -              zend_hash_clean(CG(class_table));
 -              zend_hash_clean(EG(zend_constants));
 +#ifdef HAVE_OPCACHE_FILE_CACHE
-       file_cache_only = ZCG(accel_directives).file_cache_only;
++      _file_cache_only = file_cache_only;
  #endif
-       if (!file_cache_only && ZCG(accel_directives).interned_strings_buffer) {
 +
++      if (!_file_cache_only && ZCG(accel_directives).interned_strings_buffer) {
 +              accel_use_permanent_interned_strings();
        }
  
        accel_reset_pcre_cache();
  
 -      zend_new_interned_string = orig_new_interned_string;
 -      zend_interned_strings_snapshot = orig_interned_strings_snapshot;
 -      zend_interned_strings_restore = orig_interned_strings_restore;
 -
 -#ifdef HAVE_OPCACHE_FILE_CACHE
 -      _file_cache_only = file_cache_only;
 -#endif
 -
        accel_free_ts_resources();
  
-       if (!file_cache_only) {
+       if (!_file_cache_only) {
                zend_shared_alloc_shutdown();
        }
        zend_compile_file = accelerator_orig_compile_file;

diff --cc ext/opcache/ZendAccelerator.h
Simple merge

diff --cc ext/opcache/zend_accelerator_module.c
Simple merge

diff --cc ext/opcache/zend_file_cache.c
Simple merge

diff --cc ext/opcache/zend_persist.c
Simple merge