From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 4 Sep 2017 19:24:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2824629c20ef506093303ed6071276561d09bd0;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

b2824629c20ef506093303ed6071276561d09bd0
diff --cc NEWS
index 12d4cd9edf,3803c64904..8b4c712963
--- a/NEWS
+++ b/NEWS
@@@ -1,24 -1,6 +1,28 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.10
 +?? ??? ????, PHP 7.2.0RC2
 +
 +- Date:
 +  . Fixed bug #75149 (redefinition of typedefs ttinfo and t1info). (Remi)
 +
 +- GD:
 +  . Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?). (cmb)
 +
 +- Opcache
 +  . Fixed incorect constant conditional jump elimination. (Dmitry)
 +
 +- OpenSSL
 +  . Automatically load OpenSSL configuration file. (Jakub Zelenka)
 +
++- SPL:
++  . Fixed bug #75155 (AppendIterator::append() is broken when appending another
++    AppendIterator). (Nikita)
++
 +- ZIP:
 +  . Fixed bug #75143 (new method setEncryptionName() seems not to exist
 +    in ZipArchive). (Anatol)
 +
 +31 Aug 2017, PHP 7.2.0RC1
  
  - Core:
    . Fixed #75042 run-tests.php issues with EXTENSION block). (John Boehr)