From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 9 Apr 2017 11:14:45 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84ef6fa80dbfc1ff8942209b13d9fb5439409729;p=php

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

84ef6fa80dbfc1ff8942209b13d9fb5439409729
diff --cc NEWS
index 2fbfa00756,e68c7fb368..b8a4112abb
--- a/NEWS
+++ b/NEWS
@@@ -24,14 -9,14 +24,16 @@@ PH
  - OpenSSL:
    . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
      seconds). (Moritz Fain)
 -  . Add OpenSSL 1.1.0 support. (Jakub Zelenka)
  
  - 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.0.18
 +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