Merge branch 'PHP-7.3' into PHP-7.4

diff --cc ext/opcache/zend_accelerator_module.c
index 0843d908a27fdd1ab9520ba379496d5c70f2107f,1914182c0ae1abf9e9336660ada733bdb2ff9b05..a8a1fc99a6a3088d8c1fd612014dc4f0e8197ade
--- 1/ext/opcache/zend_accelerator_module.c
--- 2/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@@ -753,11 -725,25 +753,24 @@@ static ZEND_FUNCTION(opcache_get_config
  
  #ifndef ZEND_WIN32
        add_assoc_string(&directives, "opcache.lockfile_path",          STRING_NOT_NULL(ZCG(accel_directives).lockfile_path));
+ #else
+       add_assoc_string(&directives, "opcache.mmap_base",              STRING_NOT_NULL(ZCG(accel_directives).mmap_base));
  #endif
  
 -#ifdef HAVE_OPCACHE_FILE_CACHE
        add_assoc_string(&directives, "opcache.file_cache",                    ZCG(accel_directives).file_cache ? ZCG(accel_directives).file_cache : "");
        add_assoc_bool(&directives,   "opcache.file_cache_only",               ZCG(accel_directives).file_cache_only);
        add_assoc_bool(&directives,   "opcache.file_cache_consistency_checks", ZCG(accel_directives).file_cache_consistency_checks);
 -#endif
+ #if ENABLE_FILE_CACHE_FALLBACK
+       add_assoc_bool(&directives,   "opcache.file_cache_fallback",           ZCG(accel_directives).file_cache_fallback);
+ #endif
+ 
+       add_assoc_long(&directives,   "opcache.file_update_protection",  ZCG(accel_directives).file_update_protection);
+       add_assoc_long(&directives,   "opcache.opt_debug_level",         ZCG(accel_directives).opt_debug_level);
+       add_assoc_string(&directives, "opcache.restrict_api",            STRING_NOT_NULL(ZCG(accel_directives).restrict_api));
+ #ifdef HAVE_HUGE_CODE_PAGES
+       add_assoc_bool(&directives,   "opcache.huge_code_pages",         ZCG(accel_directives).huge_code_pages);
+ #endif
++      add_assoc_string(&directives, "opcache.preload", STRING_NOT_NULL(ZCG(accel_directives).preload));
  
        add_assoc_zval(return_value, "directives", &directives);