Mercurial > hg > nginx
changeset 1348:fe5c88df87f5 stable-0.5
r1343 merge:
fix case when client has closed connection but upstream buffer is not empty
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 29 Jul 2007 17:29:06 +0000 |
parents | 142d979bc738 |
children | 50bdde056629 |
files | src/mail/ngx_mail_proxy_module.c |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mail/ngx_mail_proxy_module.c Sun Jul 29 17:27:10 2007 +0000 +++ b/src/mail/ngx_mail_proxy_module.c Sun Jul 29 17:29:06 2007 +0000 @@ -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;