From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 1 Apr 2017 23:08:24 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32dcc1eef037da88ff483dd49a5a153096d702fc;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

32dcc1eef037da88ff483dd49a5a153096d702fc
diff --cc NEWS
index 8c7afbcf0e,ed0cff2ad8..a655dd36e0
--- a/NEWS
+++ b/NEWS
@@@ -6,13 -6,13 +6,17 @@@ PH
    . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
      (krakjoe)
  
 +- Intl:
 +  . Fixed bug #65683 (Intl does not support DateTimeImmutable). (Ben Scholzen)
 +
+ - OpenSSL:
+   . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
+     seconds). (Moritz Fain)
+ 
 -13 Apr 2017 PHP 7.0.18
 +13 Apr 2017, PHP 7.1.4
  
  - Core:
 +  . Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
    . Fixed bug #73370 (falsely exits with "Out of Memory" when using
      USE_ZEND_ALLOC=0). (Nikita)
    . Fixed bug #73960 (Leak with instance method calling static method with
diff --cc php.ini-development
index 3315cb3344,50b9dbc37e..d8701951b1
--- a/php.ini-development
+++ b/php.ini-development
@@@ -1779,20 -1764,20 +1779,20 @@@ ldap.max_links = -
  
  [opcache]
  ; Determines if Zend OPCache is enabled
 -;opcache.enable=0
 +;opcache.enable=1
  
  ; Determines if Zend OPCache is enabled for the CLI version of PHP
 -;opcache.enable_cli=0
 +;opcache.enable_cli=1
  
  ; The OPcache shared memory storage size.
 -;opcache.memory_consumption=64
 +;opcache.memory_consumption=128
  
  ; The amount of memory for interned strings in Mbytes.
 -;opcache.interned_strings_buffer=4
 +;opcache.interned_strings_buffer=8
  
  ; The maximum number of keys (scripts) in the OPcache hash table.
- ; Only numbers between 200 and 100000 are allowed.
+ ; Only numbers between 200 and 1000000 are allowed.
 -;opcache.max_accelerated_files=2000
 +;opcache.max_accelerated_files=10000
  
  ; The maximum percentage of "wasted" memory until a restart is scheduled.
  ;opcache.max_wasted_percentage=5
diff --cc php.ini-production
index 601e41c573,52a11fce3f..a8ac8825e7
--- a/php.ini-production
+++ b/php.ini-production
@@@ -1779,20 -1764,20 +1779,20 @@@ ldap.max_links = -
  
  [opcache]
  ; Determines if Zend OPCache is enabled
 -;opcache.enable=0
 +;opcache.enable=1
  
  ; Determines if Zend OPCache is enabled for the CLI version of PHP
 -;opcache.enable_cli=0
 +;opcache.enable_cli=1
  
  ; The OPcache shared memory storage size.
 -;opcache.memory_consumption=64
 +;opcache.memory_consumption=128
  
  ; The amount of memory for interned strings in Mbytes.
 -;opcache.interned_strings_buffer=4
 +;opcache.interned_strings_buffer=8
  
  ; The maximum number of keys (scripts) in the OPcache hash table.
- ; Only numbers between 200 and 100000 are allowed.
+ ; Only numbers between 200 and 1000000 are allowed.
 -;opcache.max_accelerated_files=2000
 +;opcache.max_accelerated_files=10000
  
  ; The maximum percentage of "wasted" memory until a restart is scheduled.
  ;opcache.max_wasted_percentage=5