r1492 merge:

log starttls

diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 9c83bdbc80df7bae9e9426498a57f602f8a2914e..fb1db906750d16144289c9549cc79bfa2016c0e7 100644 (file)
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -2139,7 +2139,9 @@ ngx_mail_log_error(ngx_log_t *log, u_char *buf, size_t len)
         return p;
     }
 
-    p = ngx_snprintf(buf, len, ", server: %V", s->addr_text);
+    p = ngx_snprintf(buf, len, "%s, server: %V",
+                     s->starttls ? " using starttls" : "",
+                     s->addr_text);
     len -= p - buf;
     buf = p;