From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 11 Feb 2017 23:06:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d5ea20e0b0986a5d763ba39c5ad4773c2d6ade6;p=php

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

6d5ea20e0b0986a5d763ba39c5ad4773c2d6ade6
diff --cc NEWS
index 302da8d3a2,24f5d0fb76..7fd2eee24b
--- 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 efadac61d2,925d60c9bb..4cafc69c6e
--- 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