com php-src: merge PR #2290: enable opcache in CLI in 7.1+: ext/opcache/zend_accelerator_module.c php.ini-develop ment php.ini-production
| From: | Joe Watkins | Date: | Mon, 09 Jan 2017 11:00:05 +0000 |
| Subject: | com php-src: merge PR #2290: enable opcache in CLI in 7.1+: ext/opcache/zend_accelerator_module.c php.ini-develop ment php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96653@lists.php.net to get a copy of this message | ||
Commit: 71fe529afc2f9bfd99d85539c709a27f025c0caa
Author: Joe Watkins <krakjoe@php.net> Mon, 9 Jan 2017 11:00:05 +0000
Parents: 9727e37caeaec7f3d28f93fe378f53032e50a216
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71fe529afc2f9bfd99d85539c709a27f025c0caa
Log:
merge PR #2290: enable opcache in CLI in 7.1+
Bugs:
https://bugs.php.net/2290
Changed paths:
M ext/opcache/zend_accelerator_module.c
M php.ini-development
M php.ini-production
Diff:
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 4dd6d89..bd83855 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" , "0" , PHP_INI_SYSTEM,
OnUpdateBool, accel_directives.enable_cli, 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_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 0200daa..e99ac4c 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=0
+;opcache.enable_cli=1
; The OPcache shared memory storage size.
;opcache.memory_consumption=128
diff --git a/php.ini-production b/php.ini-production
index 4676692..7efb891 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=0
+;opcache.enable_cli=1
; The OPcache shared memory storage size.
;opcache.memory_consumption=128