From: Nikita Popov Date: Fri, 2 Jun 2017 21:34:32 +0000 (+0200) Subject: Revert "merge PR #2290: enable opcache in CLI in 7.1+" X-Git-Tag: php-7.2.0alpha1~15^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9ff1fac85b97c677e33210770f87f7dc4bc5a24;p=php Revert "merge PR #2290: enable opcache in CLI in 7.1+" This reverts commit 71fe529afc2f9bfd99d85539c709a27f025c0caa. Without the file cache (which is not enabled by default), this has non-trivial impact on the startup time. It also significantly increases the baseline memory usage of PHP on CLI. --- diff --git a/NEWS b/NEWS index 4735dd47a4..ff378519c0 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ PHP NEWS - Opcache: . Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp). (Laruence) + . Revert opcache.enable_cli to default disabled. (Nikita) - Reflection: . Fixed bug #74673 (Segfault when cast Reflection object to string with diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 2ed27df315..259f75c2f2 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -304,7 +304,7 @@ ZEND_INI_BEGIN() STD_PHP_INI_ENTRY("opcache.optimization_level" , DEFAULT_OPTIMIZATION_LEVEL , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.optimization_level, zend_accel_globals, accel_globals) STD_PHP_INI_ENTRY("opcache.opt_debug_level" , "0" , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.opt_debug_level, zend_accel_globals, accel_globals) STD_PHP_INI_BOOLEAN("opcache.enable_file_override" , "0" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.file_override_enabled, zend_accel_globals, accel_globals) - STD_PHP_INI_BOOLEAN("opcache.enable_cli" , "1" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.enable_cli, zend_accel_globals, accel_globals) + STD_PHP_INI_BOOLEAN("opcache.enable_cli" , "0" , PHP_INI_SYSTEM, OnUpdateBool, accel_directives.enable_cli, zend_accel_globals, accel_globals) STD_PHP_INI_ENTRY("opcache.error_log" , "" , PHP_INI_SYSTEM, OnUpdateString, accel_directives.error_log, zend_accel_globals, accel_globals) STD_PHP_INI_ENTRY("opcache.restrict_api" , "" , PHP_INI_SYSTEM, OnUpdateString, accel_directives.restrict_api, zend_accel_globals, accel_globals) diff --git a/php.ini-development b/php.ini-development index d8701951b1..e371ca5bc1 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1782,7 +1782,7 @@ ldap.max_links = -1 ;opcache.enable=1 ; Determines if Zend OPCache is enabled for the CLI version of PHP -;opcache.enable_cli=1 +;opcache.enable_cli=0 ; The OPcache shared memory storage size. ;opcache.memory_consumption=128 diff --git a/php.ini-production b/php.ini-production index a8ac8825e7..0a28d3b6f2 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1782,7 +1782,7 @@ ldap.max_links = -1 ;opcache.enable=1 ; Determines if Zend OPCache is enabled for the CLI version of PHP -;opcache.enable_cli=1 +;opcache.enable_cli=0 ; The OPcache shared memory storage size. ;opcache.memory_consumption=128