From: Nikita Popov <nikic@php.net>
Date: Sat, 23 Jul 2016 11:30:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~86^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=696d6e7c907f6e6ba4efb3f4db951eb9eb5b60de;p=php

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

696d6e7c907f6e6ba4efb3f4db951eb9eb5b60de
diff --cc NEWS
index 841aade0d7,bc7b3d970d..ea28d6cf70
--- a/NEWS
+++ b/NEWS
@@@ -13,13 -65,26 +13,16 @@@ PH
    . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape
      character). (cmb)
  
 -- SQLite3:
 -  . Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash). (Laruence)
 -
  - Standard:
 -  . Fixed bug #72622 (array_walk + array_replace_recursive create references
 -    from nothing). (Laruence)
 -  . Fixed bug #72152 (base64_decode $strict fails to detect null byte).
 -    (Lauri Kenttä)
 -  . Fixed bug #72263 (base64_decode skips a character after padding in strict
 -    mode). (Lauri Kenttä)
 -  . Fixed bug #72264 (base64_decode $strict fails with whitespace between
 -    padding). (Lauri Kenttä)
 -  . Fixed bug #72330 (CSV fields incorrectly split if escape char followed by
 -    UTF chars). (cmb)
 +  . Made base64_decode() padding checks in strict mode stricter. (Lauri Kenttä)
 +  . Made base64_decode() in non-strict mode binary safe. (Lauri Kenttä)
  
  - Streams:
 +  . Use strict mode when decoding base64 in data URIs. (Lauri Kenttä)
+   . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk)
+   . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk)
+ 
 +
  - XMLRPC:
    . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing
      array elements). (Laruence)