commit fbd2c8273154524297804e3b6fd5046e6a316b3e
author Maxim Dounin <mdounin@mdounin.ru> Tue Aug 05 12:22:07 2014 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Tue Aug 05 12:22:07 2014 +0400
tree 3343db92a12c83c693c47b50327f8b02434a0545
parent 069b7d9fb20f8545eeebd2a85a4fd93a6e8d0c75

Mail: discard pipelined commands after SMTP STARTTLS.

The bug had appeared in nginx 1.5.6 (04e43d03e153).

Reported by Chris Boulton.

src/mail/ngx_mail_smtp_handler.c

diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 665f5ef..46d703e 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -777,6 +777,9 @@
             ngx_str_null(&s->smtp_from);
             ngx_str_null(&s->smtp_to);
 
+            s->buffer->pos = s->buffer->start;
+            s->buffer->last = s->buffer->start;
+
             c->read->handler = ngx_mail_starttls_handler;
             return NGX_OK;
         }