From e042fc903883341806366b39a526711b77f5c34b Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 31 Mar 2014 21:38:27 +0400 Subject: [PATCH] Mail: fixed ngx_mail_send() (ticket #519). --- src/mail/ngx_mail_handler.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c index 9212a121c..47ddb0dcf 100644 --- a/src/mail/ngx_mail_handler.c +++ b/src/mail/ngx_mail_handler.c @@ -559,8 +559,13 @@ ngx_mail_send(ngx_event_t *wev) n = c->send(c, s->out.data, s->out.len); if (n > 0) { + s->out.data += n; s->out.len -= n; + if (s->out.len != 0) { + goto again; + } + if (wev->timer_set) { ngx_del_timer(wev); } @@ -584,6 +589,8 @@ ngx_mail_send(ngx_event_t *wev) /* n == NGX_AGAIN */ +again: + cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); ngx_add_timer(c->write, cscf->timeout);