Skip to content

Commit 0f77275

Browse files
committed
FPM: fastcgi_finish_request supports force close keepalived connection
1 parent 4280431 commit 0f77275

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

sapi/fpm/fpm/fpm_main.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,18 +1452,22 @@ static PHP_MINFO_FUNCTION(cgi)
14521452

14531453
PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
14541454
{
1455+
zend_bool close_conn = 0;
14551456
fcgi_request *request = (fcgi_request*) SG(server_context);
14561457

1457-
if (zend_parse_parameters_none() == FAILURE) {
1458+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &close_conn) == FAILURE) {
14581459
RETURN_THROWS();
14591460
}
14601461

14611462
if (!fcgi_is_closed(request)) {
14621463
php_output_end_all();
14631464
php_header();
14641465

1466+
if (close_conn) {
1467+
fcgi_request_set_keep(request, 0);
1468+
}
14651469
fcgi_end(request);
1466-
fcgi_close(request, 0, 0);
1470+
fcgi_close(request, 0, close_conn);
14671471
RETURN_TRUE;
14681472
}
14691473

sapi/fpm/fpm/fpm_main_arginfo.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)