From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 24 Sep 2017 06:54:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76b2b4a190c8a5ab264df36cf1ccdb9ddd3686ad;p=php

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

76b2b4a190c8a5ab264df36cf1ccdb9ddd3686ad
diff --cc NEWS
index f26f43862e,07fd8ef1b0..32a0d073aa
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,12 +1,16 @@@
  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)
+   . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
+     request). (Nikita)
  
 +- 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)