summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-10-28 14:19:40 +0400
committerDmitry Stogov <dmitry@zend.com>2013-10-28 14:19:40 +0400
commiteb22041ffe70d5ff206d62c6cb12fc38c23475ce (patch)
tree4084211e1a43ae9c6c5f861098d778386447297a
parent1dcca1fdb945c451b75102ff2972ab2e7867015f (diff)
downloadphp-git-eb22041ffe70d5ff206d62c6cb12fc38c23475ce.tar.gz
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
-rw-r--r--NEWS3
-rw-r--r--ext/opcache/README4
-rw-r--r--ext/opcache/zend_accelerator_module.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 81b2811617..9fe5fc4638 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP NEWS
. Fixed bug #65911 (scope resolution operator - strange behavior with $this).
(Bob Weinand)
+-OPcache
+ . Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
+
- ODBC
. Fixed bug #65950 (Field name truncation if the field name is bigger than
32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
diff --git a/ext/opcache/README b/ext/opcache/README
index 46521587fa..2e30d92c00 100644
--- a/ext/opcache/README
+++ b/ext/opcache/README
@@ -80,8 +80,8 @@ opcache.max_accelerated_files (default "2000")
The maximum number of keys (scripts) in the OPcache hash table.
The number is actually the first one in the following set of prime
numbers that is bigger than the one supplied: { 223, 463, 983, 1979, 3907,
- 7963, 16229, 32531, 65407, 130987 }. Only numbers between 200 and 100000
- are allowed.
+ 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 }. Only numbers
+ between 200 and 1000000 are allowed.
opcache.max_wasted_percentage (default "5")
The maximum percentage of "wasted" memory until a restart is scheduled.
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index dedb7215c1..0914fb68dd 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -34,7 +34,7 @@
#define STRING_NOT_NULL(s) (NULL == (s)?"":s)
#define MIN_ACCEL_FILES 200
-#define MAX_ACCEL_FILES 100000
+#define MAX_ACCEL_FILES 1000000
#define TOKENTOSTR(X) #X
static void (*orig_file_exists)(INTERNAL_FUNCTION_PARAMETERS) = NULL;