Merge branch 'PHP-7.0' into PHP-7.1

weltling · weltling · commit 2f5e49bdeb14 · 2016-11-21T22:59:30.000+01:00
* PHP-7.0:
  update php.ini-* for bug #69090
  update php.ini-* according to changes for bug #69090
diff --git 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
@@ -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.
