commit c54838711c718d3fc828c2cd53f856bf89f3d898
author Sergey Kandaurov <pluknet@nginx.com> Wed Mar 24 14:03:33 2021 +0300
committer Sergey Kandaurov <pluknet@nginx.com> Wed Mar 24 14:03:33 2021 +0300
tree 14f8265665fbbd5450cc0ab1e58cd4d3865a2215
parent 6e266113219cefe94bfb9c90fcac944748c4903f

Cancel keepalive and lingering close on EOF better (ticket #2145).

Unlike in 75e908236701, which added the logic to ngx_http_finalize_request(),
this change moves it to a more generic routine ngx_http_finalize_connection()
to cover cases when a request is finalized with NGX_DONE.

In particular, this fixes unwanted connection transition into the keepalive
state after receiving EOF while discarding request body.  With edge-triggered
event methods that means the connection will last for extra seconds as set in
the keepalive_timeout directive.

src/http/ngx_http_request.c

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index d129f80..684fabd 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2643,11 +2643,6 @@
         ngx_del_timer(c->write);
     }
 
-    if (c->read->eof) {
-        ngx_http_close_request(r, 0);
-        return;
-    }
-
     ngx_http_finalize_connection(r);
 }
 
@@ -2746,6 +2741,11 @@
 
     r = r->main;
 
+    if (r->connection->read->eof) {
+        ngx_http_close_request(r, 0);
+        return;
+    }
+
     if (r->reading_body) {
         r->keepalive = 0;
         r->lingering_close = 1;