From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 8 Feb 2017 00:10:37 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f352c50026e7b9e6116def1c201455f376e5c1a9;p=php

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

f352c50026e7b9e6116def1c201455f376e5c1a9
diff --cc NEWS
index 1cf05d08ad,5ff0ee7f63..90fd4fd8f4
--- a/NEWS
+++ b/NEWS
@@@ -8,7 -8,12 +8,11 @@@ PH
    . Fixed bug #73998 (array_key_exists fails on arrays created by
      get_object_vars). (mhagstrand)
    . Fixed bug #73954 (NAN check fails on Alpine Linux with musl). (Andrea)
 -  . Fixed bug #74039 (is_infinite(-INF) returns false). (Christian Schmidt)
  
+ - Apache:
+   . Fixed bug #61471 (Incomplete POST does not timeout but is passed to PHP).
+     (Zheng Shao)
+ 
  - GD:
    . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two
      parameters). (finwe)