From 7c642eeaf9d639f3775b0f9e9d4423146c8aa612 Mon Sep 17 00:00:00 2001 From: "zhao, haitao" Date: Thu, 10 Jan 2019 16:53:00 +0800 Subject: [PATCH] make sure to set timeout before read from the connection --- smtp.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smtp.go b/smtp.go index 547e04d..6f40030 100644 --- a/smtp.go +++ b/smtp.go @@ -84,6 +84,10 @@ func (d *Dialer) Dial() (SendCloser, error) { return nil, err } + if d.Timeout > 0 { + conn.SetDeadline(time.Now().Add(d.Timeout)) + } + if d.SSL { conn = tlsClient(conn, d.tlsConfig()) } @@ -93,10 +97,6 @@ func (d *Dialer) Dial() (SendCloser, error) { return nil, err } - if d.Timeout > 0 { - conn.SetDeadline(time.Now().Add(d.Timeout)) - } - if d.LocalName != "" { if err := c.Hello(d.LocalName); err != nil { return nil, err