From: Nikita Popov <nikic@php.net>
Date: Tue, 27 Sep 2016 17:48:35 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC3~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21f0be4792f60d303ddd025803ac647620b2a8f1;p=php

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

21f0be4792f60d303ddd025803ac647620b2a8f1
diff --cc NEWS
index e40a91e76e,0848c2e964..50c862b64d
--- a/NEWS
+++ b/NEWS
@@@ -7,6 -21,6 +7,8 @@@ PH
    . Fixed bug #73163 (PHP hangs if error handler throws while accessing undef
      const in default value). (Nikita)
    . Fixed bug #73172 (parse error: Invalid numeric literal). (Nikita, Anatol)
++  . Fixed bug #73181 (parse_str() without a second argument leads to crash).
++    (Nikita)
  
  - COM:
    . Fixed bug #73126 (Cannot pass parameter 1 by reference). (Anatol)