From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 05:45:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b6f784dd6cbcc8c8f93a0c647948dedf09ad070;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix news
---

1b6f784dd6cbcc8c8f93a0c647948dedf09ad070
diff --cc NEWS
index 0dac949f61,5caecbe6cb..1e1fb5cc63
--- a/NEWS
+++ b/NEWS
@@@ -32,17 -19,12 +32,18 @@@ PH
      seconds). (Moritz Fain)
  
  - phar:
-   . Fixed bug #74383 phar method parameters reflection correction. (mhagstrand)
+   . Fixed bug #74383 (phar method parameters reflection correction). 
+     (mhagstrand)
  
 -13 Apr 2017 PHP 7.0.18
 +- Standard:
 +  . Fixed bug #72071 (setcookie allows max-age to be negative). (Craig Duncan)
 +  . Fixed bug #74361 (Compaction in array_rand() violates COW). (Nikita)
 +
 +
 +13 Apr 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