summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-01-06 05:25:49 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-06 05:29:50 +0000
commit8e39a27b760a8fc7d2381583e95466004bc9d76a (patch)
treed816adfcbad67fdff4810f44da27a4ee4a995a4c
parenta7c444b939338bb5eadc2d64a2dbc16d9199fbe3 (diff)
parent49b2cbf7639c99a8b6129651e3dd838a19777494 (diff)
downloadphp-git-8e39a27b760a8fc7d2381583e95466004bc9d76a.tar.gz
Merge branch 'realpath_cache_size_update' into PHP-7.0
* realpath_cache_size_update: Increase realpath_cache_size default value add UPGRADING note regarding realpath_cache_size
-rw-r--r--UPGRADING1
-rw-r--r--main/main.c2
-rw-r--r--php.ini-development2
-rw-r--r--php.ini-production2
4 files changed, 4 insertions, 3 deletions
diff --git a/UPGRADING b/UPGRADING
index 355549ce5f..09522c71c2 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -788,6 +788,7 @@ out, that the corresponding SDK isn't available anymore.
. Removed asp_tags ini directive. Trying to enable it will result in a fatal
error.
. Removed always_populate_raw_post_data ini directive.
+ . realpath_cache_size set to 4096k by default
========================================
12. Windows Support
diff --git a/main/main.c b/main/main.c
index c73f05b2da..01ed3a64bc 100644
--- a/main/main.c
+++ b/main/main.c
@@ -567,7 +567,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("allow_url_include", "0", PHP_INI_SYSTEM, OnUpdateBool, allow_url_include, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("enable_post_data_reading", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, enable_post_data_reading, php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("realpath_cache_size", "16K", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
+ STD_PHP_INI_ENTRY("realpath_cache_size", "4096K", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
STD_PHP_INI_ENTRY("realpath_cache_ttl", "120", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_ttl, virtual_cwd_globals, cwd_globals)
STD_PHP_INI_ENTRY("user_ini.filename", ".user.ini", PHP_INI_SYSTEM, OnUpdateString, user_ini_filename, php_core_globals, core_globals)
diff --git a/php.ini-development b/php.ini-development
index 74b7f11baf..346890a36f 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -323,7 +323,7 @@ disable_classes =
; be increased on systems where PHP opens many files to reflect the quantity of
; the file operations performed.
; http://php.net/realpath-cache-size
-;realpath_cache_size = 16k
+;realpath_cache_size = 4096k
; Duration of time, in seconds for which to cache realpath information for a given
; file or directory. For systems with rarely changing files, consider increasing this
diff --git a/php.ini-production b/php.ini-production
index 60571aae72..cd80502c5c 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -323,7 +323,7 @@ disable_classes =
; be increased on systems where PHP opens many files to reflect the quantity of
; the file operations performed.
; http://php.net/realpath-cache-size
-;realpath_cache_size = 16k
+;realpath_cache_size = 4096k
; Duration of time, in seconds for which to cache realpath information for a given
; file or directory. For systems with rarely changing files, consider increasing this