From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 10 Sep 2017 16:46:45 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=674fe0af389b68fec9bc2d693ec2d27499c54062;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #73730 (textdomain(null) throws in strict mode)
---

674fe0af389b68fec9bc2d693ec2d27499c54062
diff --cc NEWS
index f3522d40c2,4b02a1e08b..d3e3cdbb97
--- a/NEWS
+++ b/NEWS
@@@ -15,42 -14,16 +15,45 @@@ PH
    . Fixed bug #70470 (Built-in server truncates headers spanning over TCP
      packets). (bouk)
  
 -- CURL:
 -  . Fixed bug #75093 (OpenSSL support not detected). (Remi)
 +- Date:
 +  . Fixed bug #75149 (redefinition of typedefs ttinfo and t1info). (Remi)
  
  - GD:
 -  . Fixed bug #75124 (gdImageGrayScale() may produce colors). (cmb)
    . Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?). (cmb)
  
+ - Gettext:
+   . Fixed bug #73730 (textdomain(null) throws in strict mode). (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)
 +
 +- Standard:
 +  . Fixed bug #75170 (mt_rand() bias on 64-bit machines). (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)
 +
 +- CURL:
 +  . Fixed bug #75093 (OpenSSL support not detected). (Remi)
 +  . Better fix for #74125 (use pkg-config instead of curl-config). (Remi)
 +
 +- GD:
 +  . Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image). (cmb)
 +  . Fixed bug #75124 (gdImageGrayScale() may produce colors). (cmb)
 +
  - Intl:
    . Fixed bug #75090 (IntlGregorianCalendar doesn't have constants from parent
      class). (tpunt)