summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-11-21 22:59:30 +0100
committerAnatol Belski <ab@php.net>2016-11-21 22:59:30 +0100
commit2f5e49bdeb145e7f866229d593ceeef80b6669fc (patch)
tree9fc6075923e852a68bd8ac688c4ac3c4730a3848
parent285be2f92d80273c0eae2fe1fd24e462c80e4c2a (diff)
parent914ff56cff2b10ba5bd29cae75248d2ed123bc04 (diff)
downloadphp-git-2f5e49bdeb145e7f866229d593ceeef80b6669fc.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: update php.ini-* for bug #69090 update php.ini-* according to changes for bug #69090
-rw-r--r--php.ini-development6
-rw-r--r--php.ini-production6
2 files changed, 12 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development
index c5c701e689..93ca788693 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1898,6 +1898,12 @@ ldap.max_links = -1
; This should improve performance, but requires appropriate OS configuration.
;opcache.huge_code_pages=0
+; Validate cached file permissions.
+; opcache.validate_permission=0
+
+; Prevent name collisions in chroot'ed environment.
+; opcache.validate_root=0
+
[curl]
; A default value for the CURLOPT_CAINFO option. This is required to be an
; absolute path.
diff --git a/php.ini-production b/php.ini-production
index 5cd01cbd7f..f3b5429e5f 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1898,6 +1898,12 @@ ldap.max_links = -1
; This should improve performance, but requires appropriate OS configuration.
;opcache.huge_code_pages=1
+; Validate cached file permissions.
+; opcache.validate_permission=0
+
+; Prevent name collisions in chroot'ed environment.
+; opcache.validate_root=0
+
[curl]
; A default value for the CURLOPT_CAINFO option. This is required to be an
; absolute path.