comparison src/mail/ngx_mail_proxy_module.c @ 407:fa809001e681

Merge with nginx 0.6.6.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 02 Aug 2007 23:38:26 +0000
parents 481e8f936572 f7cd062ee035
children 52b28d322d76
comparison
equal deleted inserted replaced
406:70c8001c2652 407:fa809001e681
922 break; 922 break;
923 } 923 }
924 924
925 c->log->action = "proxying"; 925 c->log->action = "proxying";
926 926
927 if ((s->connection->read->eof || s->proxy->upstream.connection->read->eof) 927 if ((s->connection->read->eof && s->buffer->pos == s->buffer->last)
928 && s->buffer->pos == s->buffer->last 928 || (s->proxy->upstream.connection->read->eof
929 && s->proxy->buffer->pos == s->proxy->buffer->last) 929 && s->proxy->buffer->pos == s->proxy->buffer->last)
930 || (s->connection->read->eof
931 && s->proxy->upstream.connection->read->eof))
930 { 932 {
931 action = c->log->action; 933 action = c->log->action;
932 c->log->action = NULL; 934 c->log->action = NULL;
933 ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxied session done"); 935 ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxied session done");
934 c->log->action = action; 936 c->log->action = action;