From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Jan 2017 22:55:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d48ff0f3f53598bbc5193dbc32a78f3624192025;p=php

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

d48ff0f3f53598bbc5193dbc32a78f3624192025
diff --cc NEWS
index 8a385eebf3,aff159edf5..ff1798b49d
--- a/NEWS
+++ b/NEWS
@@@ -19,12 -20,14 +19,14 @@@ PH
  
  - Standard:
    . Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
+   . Fixed bug #47021 (SoapClient stumbles over WSDL delivered with
+     "Transfer-Encoding: chunked"). (Rowan Collins)
  
  - ZIP:
- 	. Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb,
- 	  Mitch Hagstrand)
+   . Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb,
+     Mitch Hagstrand)
  
 -19 Jan 2017 PHP 7.0.15
 +19 Jan 2017, PHP 7.1.1
  
  - Core:
    . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)