From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 17 Mar 2017 19:20:17 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2c35fdda809ef1e4d0151e2564422ec3be319a0;p=php

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

f2c35fdda809ef1e4d0151e2564422ec3be319a0
diff --cc NEWS
index a6e58aa677,f2f392c791..dc8831bc88
--- a/NEWS
+++ b/NEWS
@@@ -8,8 -7,8 +8,10 @@@ PH
      USE_ZEND_ALLOC=0). (Nikita)
    . Fixed bug #73960 (Leak with instance method calling static method with
      referenced return). (Nikita)
 +  . Fixed bug #69676 (Resolution of self::FOO in class constants not correct).
 +    (Nikita)
+   . Fixed bug #74265 (Build problems after 7.0.17 release: undefined reference
+     to `isfinite'). (Nikita)
  
  - Date:
    . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)