Revert "Ignore lingering_close flag due it close connection before client"
authorEvgeny Sinelnikov <sin@altlinux.ru>
Fri, 29 Jul 2011 10:48:59 +0000 (14:48 +0400)
committerEvgeny Sinelnikov <sin@altlinux.ru>
Fri, 29 Jul 2011 10:48:59 +0000 (14:48 +0400)
This reverts commit ae84478cadadb91ce79b99edfd19f97ee9b442e2.

nginx/src/http/ngx_http_request.c

index e2973c8133ce50069071f3c3c640b5fd4eba8c02..2cef4fa5ba1cd0204bed7f483532daed031e222c 100644 (file)
@@ -2146,7 +2146,7 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
         ngx_http_set_keepalive(r);
         return;
 
-    } else if (clcf->lingering_timeout > 0) {
+    } else if (r->lingering_close && clcf->lingering_timeout > 0) {
         ngx_http_set_lingering_close(r);
         return;
     }