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

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

280e8dafe472e6789fdcfebd3dade4c0705b0134
diff --cc NEWS
index bb2f13f5ef,b598d4ddd0..6581516053
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,12 +1,13 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.18
 +?? ??? 2017, PHP 7.1.4
  
  - Core:
 +  . Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
    . Fixed bug #73370 (falsely exits with "Out of Memory" when using
      USE_ZEND_ALLOC=0). (Nikita)
+   . Fixed bug #73960 (Leak with instance method calling static method with
+     referenced return). (Nikita)
  
  - Date:
    . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)