Mercurial > hg > nginx

changeset 3211:3ea03c1fe050

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add lingering timeout if a response is short and a request body is being discarded, the bug was introduced in r3050
author Igor Sysoev <igor@sysoev.ru>
date Mon, 19 Oct 2009 14:08:09 +0000
parents 794613efbb71
children e67d000b5337
files src/http/ngx_http_request.c
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2101,13 +2101,20 @@ ngx_http_finalize_connection(ngx_http_re
 {
     ngx_http_core_loc_conf_t  *clcf;
 
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
     if (r->main->count != 1) {
+
+        if (r->discard_body && r->lingering_time == 0) {
+            r->lingering_time = ngx_time()
+                                      + (time_t) (clcf->lingering_time / 1000);
+            ngx_add_timer(r->connection->read, clcf->lingering_timeout);
+        }
+
         ngx_http_close_request(r, 0);
         return;
     }
 
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
     if (!ngx_terminate
          && !ngx_exiting
          && r->keepalive