changeset 3985:07d1aa82899b

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
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Aug 2011 13:52:54 +0000
parents 3e51832c8215
children 6c4d2d163611
files src/http/ngx_http_request.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2123,11 +2123,11 @@ ngx_http_finalize_connection(ngx_http_re
 
         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);
             }
         }