From: Joe Watkins <krakjoe@php.net>
Date: Thu, 26 Jan 2017 09:04:07 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d339fa4d1e82c888e4f514a741eb7ac14055671;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug
---

2d339fa4d1e82c888e4f514a741eb7ac14055671
diff --cc NEWS
index 910b48c90c,b0566a9ccc..9855df1c56
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,14 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.16
 +?? ??? 2017, PHP 7.1.2
  
  - Core:
 -  . Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference).
 -    (Laruence)
 +  . Improved GENERATOR_CREATE opcode handler. (Bob, Dmitry)
 +  . Fixed bug #73877 (readlink() returns garbage for UTF-8 paths). (Anatol)
    . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
      (Sara)
 +  . Fixed bug #73962 (bug with symlink related to cyrillic directory). (Anatol)
    . Fixed bug #73969 (segfault in debug_print_backtrace). (andrewnester)
 +  . Fixed bug #73994 (arginfo incorrect for unpack). (krakjoe)
+   . Fixed bug #73973 (assertion error in debug_zval_dump). (andrewnester)
  
  - DOM:
    . Fixed bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes).