com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/zlib/zlib.c
| From: | Christoph Michael Becker | Date: | Wed, 11 Oct 2017 15:29:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/zlib/zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99710@lists.php.net to get a copy of this message | ||
Commit: d3d23e0cb8295cd00eebd729ca182791bec22874
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 11 Oct 2017 17:29:02 +0200
Parents: 62098a10aa56e5460e3f4316fc06a40bc1bf2da0 787bf7eaf77bf1395216fa447d044935530be319
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d3d23e0cb8295cd00eebd729ca182791bec22874
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Bugs:
https://bugs.php.net/75299
Changed paths:
MM NEWS
MM ext/zlib/zlib.c
Diff:
diff --cc NEWS
index 1e56bac,efb1d1e...634061e
--- a/NEWS
+++ b/NEWS
@@@ -4,9 -4,13 +4,13 @@@ PH
- Exif:
. Fixed bug #75301 (Exif extension has built in revision version). (Peter
- Kokot).
+ Kokot)
+
+ - Zlib:
+ . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
+ Villepinte)
-26 Oct 2017 PHP 7.0.25
+26 Sep 2017, PHP 7.1.11
- Core:
. Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).