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

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

305f3c2b7602f84854154a9d878ec5174d5e88ec
diff --cc NEWS
index 08ec7bb101,820d908e7d..66a5f589d7
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,10 +1,11 @@@
  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)
  
  - Date:
    . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)