From: Joe Watkins <krakjoe@php.net>
Date: Wed, 27 Sep 2017 05:08:13 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC4~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d6c56a8eabece021b1950ac65b7d14503538b7f;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #75220 - Segfault when calling is_callable on parent
---

0d6c56a8eabece021b1950ac65b7d14503538b7f
diff --cc NEWS
index dbfdc1bb8b,4dabe47c4d..bf6942e25b
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,10 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.11
 +?? ??? ????, PHP 7.2.0RC4
  
 -- Core:
++- Core
++  . Fixed bug #75220 (Segfault when calling is_callable on parent). 
++    (andrewnester)
 +
 +28 Sep 2017, PHP 7.2.0RC3
 +
 +- Core
    . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
      (Laruence)
 +  . 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)