summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-01-09 17:08:07 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-09 17:08:07 +0000
commit28f2959b83ae6f853db7700c9f0dfffa6ce2f794 (patch)
tree5261bf79b503d64832e8ad5a4cab67bd34648c60
parentf1ad170a159fa3970e9acf9008cf06dcde6b92c7 (diff)
downloadphp-git-28f2959b83ae6f853db7700c9f0dfffa6ce2f794.tar.gz
Revert "set more suitable defaults for opcache in ini and code"
This reverts commit b655f2d6325c64e5da1f016a2742a6abf669ecaf. This has been deemed unsuitable for 7.0
-rw-r--r--ext/opcache/zend_accelerator_module.c6
-rw-r--r--php.ini-development8
-rw-r--r--php.ini-production8
3 files changed, 11 insertions, 11 deletions
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index c3b0864561..898a13c6db 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -285,9 +285,9 @@ ZEND_INI_BEGIN()
STD_PHP_INI_BOOLEAN("opcache.revalidate_path" , "0", PHP_INI_ALL , OnUpdateBool, accel_directives.revalidate_path , zend_accel_globals, accel_globals)
STD_PHP_INI_ENTRY("opcache.log_verbosity_level" , "1" , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.log_verbosity_level, zend_accel_globals, accel_globals)
- STD_PHP_INI_ENTRY("opcache.memory_consumption" , "128" , PHP_INI_SYSTEM, OnUpdateMemoryConsumption, accel_directives.memory_consumption, zend_accel_globals, accel_globals)
- STD_PHP_INI_ENTRY("opcache.interned_strings_buffer", "8" , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.interned_strings_buffer, zend_accel_globals, accel_globals)
- STD_PHP_INI_ENTRY("opcache.max_accelerated_files" , "10000", PHP_INI_SYSTEM, OnUpdateMaxAcceleratedFiles, accel_directives.max_accelerated_files, zend_accel_globals, accel_globals)
+ STD_PHP_INI_ENTRY("opcache.memory_consumption" , "64" , PHP_INI_SYSTEM, OnUpdateMemoryConsumption, accel_directives.memory_consumption, zend_accel_globals, accel_globals)
+ STD_PHP_INI_ENTRY("opcache.interned_strings_buffer", "4" , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.interned_strings_buffer, zend_accel_globals, accel_globals)
+ STD_PHP_INI_ENTRY("opcache.max_accelerated_files" , "2000", PHP_INI_SYSTEM, OnUpdateMaxAcceleratedFiles, accel_directives.max_accelerated_files, zend_accel_globals, accel_globals)
STD_PHP_INI_ENTRY("opcache.max_wasted_percentage" , "5" , PHP_INI_SYSTEM, OnUpdateMaxWastedPercentage, accel_directives.max_wasted_percentage, zend_accel_globals, accel_globals)
STD_PHP_INI_ENTRY("opcache.consistency_checks" , "0" , PHP_INI_ALL , OnUpdateLong, accel_directives.consistency_checks, zend_accel_globals, accel_globals)
STD_PHP_INI_ENTRY("opcache.force_restart_timeout" , "180" , PHP_INI_SYSTEM, OnUpdateLong, accel_directives.force_restart_timeout, zend_accel_globals, accel_globals)
diff --git a/php.ini-development b/php.ini-development
index 3b49fea874..346890a36f 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1764,20 +1764,20 @@ ldap.max_links = -1
[opcache]
; Determines if Zend OPCache is enabled
-;opcache.enable=1
+;opcache.enable=0
; Determines if Zend OPCache is enabled for the CLI version of PHP
;opcache.enable_cli=0
; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
+;opcache.memory_consumption=64
; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
+;opcache.interned_strings_buffer=4
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 100000 are allowed.
-;opcache.max_accelerated_files=10000
+;opcache.max_accelerated_files=2000
; The maximum percentage of "wasted" memory until a restart is scheduled.
;opcache.max_wasted_percentage=5
diff --git a/php.ini-production b/php.ini-production
index b18b21fd59..cd80502c5c 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1764,20 +1764,20 @@ ldap.max_links = -1
[opcache]
; Determines if Zend OPCache is enabled
-;opcache.enable=1
+;opcache.enable=0
; Determines if Zend OPCache is enabled for the CLI version of PHP
;opcache.enable_cli=0
; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
+;opcache.memory_consumption=64
; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
+;opcache.interned_strings_buffer=4
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 100000 are allowed.
-;opcache.max_accelerated_files=10000
+;opcache.max_accelerated_files=2000
; The maximum percentage of "wasted" memory until a restart is scheduled.
;opcache.max_wasted_percentage=5