com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS main/fastcgi.c main/fastcgi.h sapi/fpm/fpm/fpm_main.c

Commit:    6d5ea20e0b0986a5d763ba39c5ad4773c2d6ade6
Author:    Nikita Popov <[email protected]>         Sun, 12 Feb 2017 00:06:20 +0100
Parents:   bf2627e58c7654d1d99dd4822055a71007cf9b33 9814be4bc28892d1e0a5dc875fef0b4bde455d23
Branches:  PHP-7.1 master

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

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

Changed paths:
  MM  NEWS
  MM  main/fastcgi.c
  MM  main/fastcgi.h
  MM  sapi/fpm/fpm/fpm_main.c


Diff:
diff --cc NEWS
index 302da8d,24f5d0f..7fd2eee
--- a/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.h
index efadac6,925d60c..4cafc69
--- a/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