From: Sergey Kandaurov <pluknet@nginx.com>
Date: Tue, 24 Nov 2020 17:19:40 +0000 (+0000)
Subject: Merged with the default branch.
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=5a9a897d7b632d6123aacabf1c0f141db0ad799b;p=nginx.git

Merged with the default branch.
---

5a9a897d7b632d6123aacabf1c0f141db0ad799b
diff --cc src/http/ngx_http_request.c
index 8df43891a,12a68a961..3b9e59005
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@@ -3558,15 -3420,15 +3572,17 @@@ ngx_http_set_lingering_close(ngx_connec
          }
      }
  
 -    if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) {
 -        ngx_connection_error(c, ngx_socket_errno,
 -                             ngx_shutdown_socket_n " failed");
 -        ngx_http_close_request(r, 0);
 -        return;
 +    if (c->fd != NGX_INVALID_FILE) {
 +        if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) {
 +            ngx_connection_error(c, ngx_socket_errno,
 +                                 ngx_shutdown_socket_n " failed");
 +            ngx_http_close_request(r, 0);
 +            return;
 +        }
      }
  
+     ngx_add_timer(rev, clcf->lingering_timeout);
+ 
      if (rev->ready) {
          ngx_http_lingering_close_handler(rev);
      }