From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 25 Jun 2017 17:48:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~28^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=653b96347ca432ae5d124b2c263a6aa196675360;p=php

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

653b96347ca432ae5d124b2c263a6aa196675360
diff --cc NEWS
index 0682396985,58e7654de8..8230e6efa7
--- a/NEWS
+++ b/NEWS
@@@ -6,18 -6,8 +6,19 @@@ PH
    . Fixed bug #74780 (parse_url() borken when query string contains colon). 
      (jhdxr)
    . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
+   . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
  
 +- Opcache:
 +  . Fixed bug #74623 (Infinite loop in type inference when using HTMLPurifier).
 +    (nikic)
 +
 +- OpenSSL:
 + . Fixed bug #74798 (pkcs7_en/decrypt does not work if \x0a is used in content).
 +   (Anatol)
 + . Added OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding and fix bug
 +   #71917 (openssl_open() returns junk on envelope < 16 bytes) and bug #72362
 +   (OpenSSL Blowfish encryption is incorrect for short keys). (Jakub Zelenka)
 +
  - SPL:
    . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)