From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 1 Sep 2017 22:14:41 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4dc3de5ab49d543564ab2fec0bcf31b8fea9223;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
---

b4dc3de5ab49d543564ab2fec0bcf31b8fea9223
diff --cc NEWS
index 95612e39d5,8103b9445e..f5c9cac6de
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,6 +1,18 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.10
 +?? ??? ????, PHP 7.2.0RC2
 +
++- GD:
++  . Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?). (cmb)
++
 +- OpenSSL
 +  . Automatically load OpenSSL configuration file. (Jakub Zelenka)
 +
 +- 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)