com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS sapi/apache2handler/php_apache.h sapi/apache2handler/ sapi_apache2.c

Commit:    f352c50026e7b9e6116def1c201455f376e5c1a9
Author:    Nikita Popov <[email protected]>         Wed, 8 Feb 2017 01:10:37 +0100
Parents:   8417a3be38f778b3c87e10f81e0d1e35a60e2200 80c8d84af303d2fddc9ba9f181c7117b9040811d
Branches:  PHP-7.1 master

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

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

Changed paths:
  MM  NEWS
  MM  sapi/apache2handler/php_apache.h
  MM  sapi/apache2handler/sapi_apache2.c


Diff:
diff --cc NEWS
index 1cf05d0,5ff0ee7..90fd4fd
--- 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)