From: Sara Golemon <pollita@php.net>
Date: Sun, 28 May 2017 04:14:02 +0000 (-0700)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9458aac9d3f932e9b0da4d099d645d7e74ac4e2;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74598 ftp:// ignores context
---

d9458aac9d3f932e9b0da4d099d645d7e74ac4e2
diff --cc NEWS
index ba33a3bf4e,c51b14ec6a..76599d7f5e
--- a/NEWS
+++ b/NEWS
@@@ -14,7 -14,10 +14,10 @@@ PH
    . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
      (jhdxr)
  
+ - FTP:
+   . Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara)
+ 
 -8 Jun 2017 PHP 7.0.20
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).