From: Andrea Faulds <ajf@ajf.me>
Date: Wed, 20 Sep 2017 23:03:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC3~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b71023e2977e44fd3bd94516eaebf77fd9907dd9;p=php

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

b71023e2977e44fd3bd94516eaebf77fd9907dd9
diff --cc NEWS
index 50ca8ada9e,f937e78d7d..7168c70518
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,10 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.25
 +?? ??? ????, PHP 7.1.11
  
+ - Core:
+   . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
+ 
 +- MySQLi:
 +  . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)
 +
 +- PDO_mysql:
 +  . Fixed bug #75177 (Type 'bit' is fetched as unexpected string). (Anatol)
 +
  - SPL:
    . Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags).
      (J. Jeising, cmb)