diff options
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 167bc715a..d11b13e4a 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -2142,8 +2142,14 @@ ngx_http_finalize_connection(ngx_http_request_t *r) { ngx_http_set_keepalive(r); return; + } - } else if (r->lingering_close && clcf->lingering_timeout > 0) { + if (clcf->lingering_close == NGX_HTTP_LINGERING_ALWAYS + || (clcf->lingering_close == NGX_HTTP_LINGERING_ON + && (r->lingering_close + || r->header_in->pos < r->header_in->last + || r->connection->read->ready))) + { ngx_http_set_lingering_close(r); return; } @@ -2769,7 +2775,6 @@ ngx_http_lingering_close_handler(ngx_event_t *rev) "http lingering close handler"); if (rev->timedout) { - c->timedout = 1; ngx_http_close_request(r, 0); return; } |