From: Nikita Popov <nikic@php.net>
Date: Wed, 27 Jul 2016 13:58:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fab18151929c4c964d2bbe2c0c830ba82292d075;p=php

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

fab18151929c4c964d2bbe2c0c830ba82292d075
diff --cc NEWS
index 70d667af03,241dcad604..2c0b282cc0
--- a/NEWS
+++ b/NEWS
@@@ -29,7 -77,26 +29,13 @@@ PH
  - SQLite3:
    . Fixed bug #72668 (Spurious warning when exception is thrown in user defined
      function). (Laruence)
 -  . 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)
  
+ - Streams:
+   . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk)
+   . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk)
+   . Fixed bug #72667 (opendir() with ftp:// attempts to open data stream for
+     non-existent directories). (vhuk)
+ 
  - XMLRPC:
    . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing
      array elements). (Laruence)