commit 88bcb974231772d25950a62059e96e1287498d5c
author Igor Sysoev <igor@sysoev.ru> Sun Jul 29 17:29:06 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Sun Jul 29 17:29:06 2007 +0000
tree ff9c7809ee0b6e5e4325cd3496301b14a644cce9
parent 567f8f61f73323f83fedba1a1e2879aa616da52d

r1343 merge:

fix case when client has closed connection but upstream buffer is not empty

src/mail/ngx_mail_proxy_module.c

diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 894c01d..ae2fc4c 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -866,9 +866,11 @@
 
     c->log->action = "proxying";
 
-    if ((s->connection->read->eof || s->proxy->upstream.connection->read->eof)
-        && s->buffer->pos == s->buffer->last
-        && s->proxy->buffer->pos == s->proxy->buffer->last)
+    if ((s->connection->read->eof && s->buffer->pos == s->buffer->last)
+        || (s->proxy->upstream.connection->read->eof
+            && s->proxy->buffer->pos == s->proxy->buffer->last)
+        || (s->connection->read->eof
+            && s->proxy->upstream.connection->read->eof))
     {
         action = c->log->action;
         c->log->action = NULL;