Mercurial > hg > nginx

changeset 1063:e2a6ecc5a3ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a non-active client connection must not closed after send timeout
author Igor Sysoev <igor@sysoev.ru>
date Fri, 19 Jan 2007 12:22:32 +0000
parents bc9751affada
children 7c84c877f2d7
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1700,7 +1700,7 @@ ngx_http_upstream_process_non_buffered_b
         }
     }
 
-    if (downstream->write->active) {
+    if (downstream->write->active && !downstream->write->ready) {
         ngx_add_timer(downstream->write, clcf->send_timeout);
 
     } else if (downstream->write->timer_set) {
@@ -1712,7 +1712,7 @@ ngx_http_upstream_process_non_buffered_b
         return;
     }
 
-    if (upstream->read->active) {
+    if (upstream->read->active && !upstream->read->ready) {
         ngx_add_timer(upstream->read, u->conf->read_timeout);
 
     } else if (upstream->read->timer_set) {