mirror of
https://github.com/nginx/nginx.git
synced 2025-08-01 11:16:14 +08:00
r1343 merge:
fix case when client has closed connection but upstream buffer is not empty
This commit is contained in:
parent
567f8f61f7
commit
88bcb97423
@ -866,9 +866,11 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
|
|||||||
|
|
||||||
c->log->action = "proxying";
|
c->log->action = "proxying";
|
||||||
|
|
||||||
if ((s->connection->read->eof || s->proxy->upstream.connection->read->eof)
|
if ((s->connection->read->eof && s->buffer->pos == s->buffer->last)
|
||||||
&& s->buffer->pos == s->buffer->last
|
|| (s->proxy->upstream.connection->read->eof
|
||||||
&& s->proxy->buffer->pos == s->proxy->buffer->last)
|
&& s->proxy->buffer->pos == s->proxy->buffer->last)
|
||||||
|
|| (s->connection->read->eof
|
||||||
|
&& s->proxy->upstream.connection->read->eof))
|
||||||
{
|
{
|
||||||
action = c->log->action;
|
action = c->log->action;
|
||||||
c->log->action = NULL;
|
c->log->action = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user