From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 6 Jan 2017 14:39:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~149^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc75e8bca5bf4cfb000620156b7e6cf38a22bdeb;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: Fix bug 70103 when ZTS is enabled
---

cc75e8bca5bf4cfb000620156b7e6cf38a22bdeb
diff --cc NEWS
index 10a25835ab,d19ab0d5cf..caa9269cf0
--- a/NEWS
+++ b/NEWS
@@@ -15,9 -15,10 +15,10 @@@ PH
    . Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
  
  - ZIP:
-   . Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb)
+ 	. 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)