summaryrefslogtreecommitdiff
path: root/sapi/fpm
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-02-12 00:06:47 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-02-12 00:06:47 +0100
commit5383c9d9e5caf20c7699fa838381757d2818f4f9 (patch)
treef3cf511273e7cb67e69879ddd639a49dabf880fe /sapi/fpm
parent048aec47963ac86580a96ff64fa6d16de2f86045 (diff)
parent6d5ea20e0b0986a5d763ba39c5ad4773c2d6ade6 (diff)
downloadphp-git-5383c9d9e5caf20c7699fa838381757d2818f4f9.tar.gz
Merge branch 'PHP-7.1'
Diffstat (limited to 'sapi/fpm')
-rw-r--r--sapi/fpm/fpm/fpm_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 40268916aa..dd0269e353 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1995,7 +1995,8 @@ fastcgi_request_done:
requests++;
if (UNEXPECTED(max_requests && (requests == max_requests))) {
- fcgi_finish_request(request, 1);
+ fcgi_request_set_keep(request, 0);
+ fcgi_finish_request(request, 0);
break;
}
/* end of fastcgi loop */