diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-01-19 12:22:32 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-01-19 12:22:32 +0000 |
| commit | ae2006b2fe27e09a73e2b7d42cc696f74ff96862 (patch) | |
| tree | 0438d2d20fd4035732388b701c931aafdb23d8b2 | |
| parent | 66f76d2f72dcd569607388adf20d2b2a3fbc679b (diff) | |
| download | nginx-ae2006b2fe27e09a73e2b7d42cc696f74ff96862.tar.gz nginx-ae2006b2fe27e09a73e2b7d42cc696f74ff96862.zip | |
a non-active client connection must not closed after send timeout
| -rw-r--r-- | src/http/ngx_http_upstream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index f9d2482ea..780528a33 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1700,7 +1700,7 @@ ngx_http_upstream_process_non_buffered_body(ngx_event_t *ev) } } - 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_body(ngx_event_t *ev) 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) { |