]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 8 Sep 2018 17:08:59 +0000 (19:08 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 8 Sep 2018 17:09:56 +0000 (19:09 +0200)
commitfa70b91a4f71ff6ed9dabde868b785267ae9d189
tree74b84f62c0ce633a3c2ef0a9aa3cc59c4c8163ee
parentcfdd828163bc03b63e41d92adc5b127f567e4c46
parent90d863898cd4d7a1e073916b4730aca33cc29184
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
NEWS
ext/zlib/zlib_filter.c