From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 16 Feb 2017 16:35:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca43b873a6ad8426794262de261a1764a933cfa;p=php

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

9ca43b873a6ad8426794262de261a1764a933cfa
diff --cc NEWS
index f94927f251,4c73dbfbe6..60d961e7e1
--- a/NEWS
+++ b/NEWS
@@@ -13,6 -11,9 +13,8 @@@ PH
    . Fixed bug #73998 (array_key_exists fails on arrays created by
      get_object_vars). (mhagstrand)
    . Fixed bug #73954 (NAN check fails on Alpine Linux with musl). (Andrea)
 -  . Fixed bug #74039 (is_infinite(-INF) returns false). (Christian Schmidt)
+   . Fixed bug #73677 (Generating phar.phar core dump with gcc ASAN enabled
+     build). (ondrej)
  
  - Apache:
    . Fixed bug #61471 (Incomplete POST does not timeout but is passed to PHP).