com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/openssl/openssl.c php.ini-development php.ini-production

[email protected] (Nikita Popov)
Newsgroups php.cvs
Message-ID <[email protected]>
Commit:    32dcc1eef037da88ff483dd49a5a153096d702fc
Author:    Nikita Popov <[email protected]>         Sun, 2 Apr 2017 01:08:24 +0200
Parents:   dfb4875850d70b52ebf3cd1e530d2dae7ffe6240 670041b60ec25e822564d337bae96e82e8d9ac89
Branches:  PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=32dcc1eef037da88ff483dd49a5a153096d702fc

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

Changed paths:
  MM  NEWS
  MM  ext/openssl/openssl.c
  MM  php.ini-development
  MM  php.ini-production


Diff:
diff --cc NEWS
index 8c7afbc,ed0cff2..a655dd3
--- 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 3315cb3,50b9dbc..d870195
--- 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 601e41c,52a11fc..a8ac882
--- 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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.