# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1169209352 0
# Node ID e2a6ecc5a3ae902e19a02f1d15270d1023251cd0
# Parent  bc9751affadad1473990f9cf9fe9374ff6bd1c4a
a non-active client connection must not closed after send timeout

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- 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) {