Merged with the default branch.

diff --cc auto/make
Simple merge

diff --cc auto/options
Simple merge

diff --cc src/event/ngx_event_openssl.c
Simple merge

diff --cc src/http/ngx_http_request.c
index 8df43891a69603e499edd3d6b76c47bdf8b3a3a1,12a68a961d97e6e6ed2d2fc644efbe29edd5b798..3b9e590050be354adc399271e3ec4cfd72a17b4f
--- 1/src/http/ngx_http_request.c
--- 2/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);
      }

diff --cc src/http/ngx_http_request_body.c
Simple merge