From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 1 Aug 2011 13:52:54 +0000 (+0000)
Subject: always set timer in discard body handler, this fixes the cases
X-Git-Tag: release-1.1.0~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=21fd22d089d92f4f1db5ad776545c3c8d389ce1d;p=nginx.git

always set timer in discard body handler, this fixes the cases
when request for static file is redirected by error_page to an SSI page

patch by Maxim Dounin
---

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index d11b13e4a..5e0b8e891 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2123,11 +2123,11 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 
         if (r->discard_body) {
             r->read_event_handler = ngx_http_discarded_request_body_handler;
+            ngx_add_timer(r->connection->read, clcf->lingering_timeout);
 
             if (r->lingering_time == 0) {
                 r->lingering_time = ngx_time()
                                       + (time_t) (clcf->lingering_time / 1000);
-                ngx_add_timer(r->connection->read, clcf->lingering_timeout);
             }
         }