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

Merge branch 'PHP-7.0' into PHP-7.1

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

2dd77456fe0f9e01f80414790653ce94156f67ab
diff --cc NEWS
index 849d8dd3d0,c3c39bb418..4dabe47c4d
--- a/NEWS
+++ b/NEWS
@@@ -8,13 -8,9 +8,15 @@@ PH
    . 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)
+   . Fixed bug #75220 (Segfault when calling is_callable on parent). 
+     (andrewnester)
  
 +- 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)