Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

diff --cc NEWS
index 011f0f740d79ca7806a357aa937309c458546e01,634061e34402237905c47c1503e4cfc50e90b103..c423f96cb9dab1ab8301b32ab1d23836dd51ca99
--- 1/NEWS
--- 2/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 3478fe536b65572ca6a49b6916c6ba2a127f8196,b5d37ddca61f6c8e23396cd3ff3f3eacd99c2384..eb52ad2ae149350a0d95218f910abbe500c1c44e
--- 1/ext/zlib/zlib.c
--- 2/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[] */