Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 302da8d3a29ee78eee398860b6b163da92e6778c,24f5d0fb76a8ec64cac27459bcb865588f08850c..7fd2eee24b64ea37befc3794840a529ef047a472
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -13,10 -14,10 +13,14 @@@ PH
    . Fixed bug #61471 (Incomplete POST does not timeout but is passed to PHP).
      (Zheng Shao)
  
 +- Date:
 +  . Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
 +    (Derick)
 +
+ - FPM:
+   . Fixed bug #69860 (php-fpm process accounting is broken with keepalive).
+     (Denis Yeldandi)
+ 
  - GD:
    . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two
      parameters). (finwe)

diff --cc main/fastcgi.c
Simple merge

diff --cc main/fastcgi.h
index efadac61d2078afa19b13673617b94855b502bb4,925d60c9bb6c871ce5268449be95b43589dd8be5..4cafc69c6ea2854a432ee558270c325baac6a184
--- 1/main/fastcgi.h
--- 2/main/fastcgi.h
+++ b/main/fastcgi.h
@@@ -102,9 -102,10 +102,10 @@@ int fcgi_accept_request(fcgi_request *r
  int fcgi_finish_request(fcgi_request *req, int force_close);
  const char *fcgi_get_last_client_ip();
  void fcgi_set_in_shutdown(int new_value);
+ void fcgi_request_set_keep(fcgi_request *req, int new_value);
  
  #ifndef HAVE_ATTRIBUTE_WEAK
 -typedef void (*fcgi_logger)(int type, const char *fmt, ...);
 +typedef void (*fcgi_logger)(int type, const char *fmt, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
  void fcgi_set_logger(fcgi_logger lg);
  #endif
  

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge