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

Commit:    f3ab4c1a086b17daad7a8ecf34292fff6b9566ce
Author:    Bob Weinand <[email protected]>         Wed, 15 Mar 2017 00:09:42 +0100
Parents:   3d4e954518e467ae6853ee2d22defa35b32b2c73 7fba8bda4c9e89c522e5d27a38489125e36b9904
Branches:  PHP-7.1

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=f3ab4c1a086b17daad7a8ecf34292fff6b9566ce

Log:
Merge branch 'PHP-7.0' into PHP-7.1

Changed paths:
  MM  NEWS
  MM  ext/zlib/zlib.c


Diff:
diff --cc NEWS
index 0229b37,071fcc8..8fce4e9
--- a/NEWS
+++ b/NEWS
@@@ -24,24 -23,15 +24,27 @@@ PH
    . Fixed bug #71003 (Expose MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT to PDO
      interface). (Thomas Orozco)
  
 +- SPL:
 +  . Fixed bug #74058 (ArrayObject can not notice changes). (Andrew Nester)
 +
 +- Sqlite:
 +  . Implemented FR #74217 (Allow creation of deterministic sqlite functions).
 +    (Andrew Nester)
 +
- . Streams:
+ - Streams:
    . Fixed bug #74216 (Correctly fail on invalid IP address ports). (Sara)
  
+ - Zlib:
+   . Fixed bug #74240 (deflate_add can allocate too much memory). (Matt Bonneau)
+ 
 -16 Mar 2017 PHP 7.0.17
 +16 Mar 2017, PHP 7.1.3
  
  - Core:
 +  . Fixed bug #74157 (Segfault with nested generators). (Laruence)
 +  . Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to
 +    typehinted by-ref arg). (Laruence)
 +  . Fixed bug #74093 (Maximum execution time of n+2 seconds exceed not written
 +    in error_log). (Laruence)
    . Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite).
      (Dmitry, Laruence)
    . Fixed bug #74084 (Out of bound read - zend_mm_alloc_small). (Laruence)