Merge branch 'PHP-7.0' into PHP-7.1

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

diff --cc NEWS
index 1e56bac1d4effb9e020e07c13cda8e1168ed0e57,efb1d1eb56e19ddcfdc172ce33d5620f6514ed49..634061e34402237905c47c1503e4cfc50e90b103
--- 1/NEWS
--- 2/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()).

diff --cc ext/zlib/zlib.c
Simple merge