com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/zlib/zlib.c

From: Date: Wed, 11 Oct 2017 15:30:45 +0000
Subject: com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/zlib/zlib.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99708@lists.php.net to get a copy of this message
Commit: 1f150fcde1cb777023a5c03e2869dd6496e2bcbe Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 11 Oct 2017 17:30:17 +0200 Parents: 50bd4996fd96805b896ce77810f0a843e1190f86 d3d23e0cb8295cd00eebd729ca182791bec22874 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f150fcde1cb777023a5c03e2869dd6496e2bcbe Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: 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 011f0f7,634061e..c423f96 --- a/NEWS +++ b/NEWS @@@ -4,11 -4,20 +4,15 @@@ 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 Sep 2017, PHP 7.1.11 +12 Oct 2017, PHP 7.2.0RC4 -- Core: - . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()). - (Laruence) - . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea) - . Fixed bug #75252 (Incorrect token formatting on two parse errors in one - request). (Nikita) +- Core . Fixed bug #75220 (Segfault when calling is_callable on parent). (andrewnester) . Fixed bug #75290 (debug info of Closures of internal functions contain diff --cc ext/zlib/zlib.c index 3478fe5,b5d37dd..eb52ad2 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@@ -1369,18 -1319,11 +1370,19 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_add, 0, 0, 2) - ZEND_ARG_INFO(0, resource) - ZEND_ARG_INFO(0, flush_behavior) + ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, encoded_data) + ZEND_ARG_INFO(0, flush_mode) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_get_status, 0, 0, 1) + ZEND_ARG_INFO(0, resource) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_get_read_len, 0, 0, 1) + ZEND_ARG_INFO(0, resource) +ZEND_END_ARG_INFO() + /* }}} */ /* {{{ php_zlib_functions[] */

« previous php.cvs (#99708) next »