Merge branch 'PHP-7.0' into PHP-7.1

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

diff --cc NEWS
index 10a25835ab03b25657efc38598cd33a4d630ebfd,d19ab0d5cf49834ed6bb00001d2a1d64f5c17017..caa9269cf074987adb564720925fb7ec935ca4f9
--- 1/NEWS
--- 2/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)

diff --cc ext/zip/php_zip.c
Simple merge