From: Christoph M. Becker Date: Tue, 12 May 2020 17:47:13 +0000 (+0200) Subject: Merge branch 'PHP-7.3' into PHP-7.4 X-Git-Tag: php-7.4.7RC1~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=129fd647a16b2353dd5a92edccc904619e68ab77;p=php Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Fix #79588: Boolean opcache settings ignore on/off values --- 129fd647a16b2353dd5a92edccc904619e68ab77 diff --cc NEWS index 345c2bad68,d1f6f33f5b..67ec17d50f --- a/NEWS +++ b/NEWS @@@ -6,13 -6,11 +6,16 @@@ PH . Fixed bug #79566 (Private SHM is not private on Windows). (cmb) . Fixed bug #79489 (.user.ini does not inherit). (cmb) +- FFI: + . Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb) + + - Opcache: - . Fixed bug #79535 (PHP crashes with specific opcache.optimization_level). - (Nikita) + . Fixed bug #79588 (Boolean opcache settings ignore on/off values). (cmb) + +- SimpleXML: + . Fixed bug #79528 (Different object of the same xml between 7.4.5 and + 7.4.4). (cmb) + - Standard: . Fixed bug #79561 (dns_get_record() fails with DNS_ALL). (cmb) diff --cc ext/opcache/zend_accelerator_module.c index 7d04e49f32,24af035916..88f3dd70be --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@@ -311,11 -313,13 +311,11 @@@ ZEND_INI_BEGIN( STD_PHP_INI_ENTRY("opcache.mmap_base", NULL, PHP_INI_SYSTEM, OnUpdateString, accel_directives.mmap_base, zend_accel_globals, accel_globals) #endif -#ifdef HAVE_OPCACHE_FILE_CACHE STD_PHP_INI_ENTRY("opcache.file_cache" , NULL , PHP_INI_SYSTEM, OnUpdateFileCache, accel_directives.file_cache, zend_accel_globals, accel_globals) - STD_PHP_INI_ENTRY("opcache.file_cache_only" , "0" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_only, zend_accel_globals, accel_globals) - STD_PHP_INI_ENTRY("opcache.file_cache_consistency_checks" , "1" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_consistency_checks, zend_accel_globals, accel_globals) + STD_PHP_INI_BOOLEAN("opcache.file_cache_only" , "0" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_only, zend_accel_globals, accel_globals) + STD_PHP_INI_BOOLEAN("opcache.file_cache_consistency_checks" , "1" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_consistency_checks, zend_accel_globals, accel_globals) -#endif #if ENABLE_FILE_CACHE_FALLBACK - STD_PHP_INI_ENTRY("opcache.file_cache_fallback" , "1" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_fallback, zend_accel_globals, accel_globals) + STD_PHP_INI_BOOLEAN("opcache.file_cache_fallback" , "1" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_cache_fallback, zend_accel_globals, accel_globals) #endif #ifdef HAVE_HUGE_CODE_PAGES STD_PHP_INI_BOOLEAN("opcache.huge_code_pages" , "0" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.huge_code_pages, zend_accel_globals, accel_globals)