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

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

7418f6814fd9f8d2066f1197ce8d4866811bbd0f
diff --cc NEWS
index 996db875c4,7168c70518..f26f43862e
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,10 +1,14 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.11
 +?? ??? ????, PHP 7.2.0RC3
  
 -- Core:
 +- Core
 +  . Fixed bug #74878 (Data race in ZTS builds). (Nikita, Dmitry)
+   . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
  
 +- FPM:
 +  . Fixed bug #75212 (php_value acts like php_admin_value). (Remi)
 +
  - MySQLi:
    . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)