Mercurial > hg > nginx-mail
diff src/mail/ngx_mail_handler.c @ 403:d4cac61d8e95
Merge with nginx 0.6.5.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 23 Jul 2007 22:45:18 +0000 |
parents | f1e2fab7a46c d16d691432c9 |
children | 481e8f936572 |
line wrap: on
line diff
--- a/src/mail/ngx_mail_handler.c +++ b/src/mail/ngx_mail_handler.c @@ -1408,7 +1408,6 @@ ngx_imap_auth_state(ngx_event_t *rev) ngx_mail_do_auth(s); return; - } } else if (rc == NGX_IMAP_NEXT) { @@ -1464,6 +1463,7 @@ ngx_imap_auth_state(ngx_event_t *rev) s->arg_start = s->buffer->start + s->tag.len; s->buffer->pos = s->arg_start; s->buffer->last = s->arg_start; + } else { s->buffer->pos = s->buffer->start; s->buffer->last = s->buffer->start; @@ -1851,8 +1851,8 @@ ngx_smtp_auth_state(ngx_event_t *rev) c->read->handler = ngx_mail_starttls_handler; /* - * RFC3207 requires us to discard any knowledge obtained - * from client before STARTTLS. + * RFC3207 requires us to discard any knowledge + * obtained from client before STARTTLS. */ s->smtp_helo.len = 0;