com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/zip/php_zip.c
| From: | Christoph Michael Becker | Date: | Fri, 06 Jan 2017 14:44:31 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/zip/php_zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96567@lists.php.net to get a copy of this message | ||
Commit: cc75e8bca5bf4cfb000620156b7e6cf38a22bdeb
Author: Christoph M. Becker <cmbecker69@gmx.de> Fri, 6 Jan 2017 15:39:33 +0100
Parents: ec0daf7913c69ab7fb307bd42628a9c9f46c1871 ad08aa39561eb6aa3d03b2be06ed3894dbb2892c
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc75e8bca5bf4cfb000620156b7e6cf38a22bdeb
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #70103: Fix bug 70103 when ZTS is enabled
Bugs:
https://bugs.php.net/70103
Changed paths:
MM NEWS
MM ext/zip/php_zip.c
Diff:
diff --cc NEWS
index 10a2583,d19ab0d..caa9269
--- 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)