Fix hanging connection during client construction

Set timeout value to the client to supply deadline values to Support calls in the client.New function

Author: doganpoyraz

client/client.go

@@ -581,6 +581,11 @@ func (c *Client) SetDebug(w io.Writer) {
 
 // New creates a new client from an existing connection.
 func New(conn net.Conn) (*Client, error) {
+	return NewWithTimeout(conn, 0)
+}
+
+// New creates a new client from an existing connection with a timeout.
+func NewWithTimeout(conn net.Conn, timeout time.Duration) (*Client, error) {
 	continues := make(chan bool)
 	w := imap.NewClientWriter(nil, continues)
 	r := imap.NewReader(nil)
@@ -591,6 +596,7 @@ func New(conn net.Conn) (*Client, error) {
 		continues: continues,
 		state:     imap.ConnectingState,
 		ErrorLog:  log.New(os.Stderr, "imap/client: ", log.LstdFlags),
+		Timeout:   timeout,
 	}
 
 	c.handleContinuationReqs()
@@ -632,14 +638,16 @@ func DialWithDialer(dialer Dialer, addr string) (*Client, error) {
 	// there is no way to set the client's Timeout for that action. As a
 	// workaround, if the dialer has a timeout set, use that for the connection's
 	// deadline.
+	var timeout time.Duration
 	if netDialer, ok := dialer.(*net.Dialer); ok && netDialer.Timeout > 0 {
 		err := conn.SetDeadline(time.Now().Add(netDialer.Timeout))
 		if err != nil {
 			return nil, err
 		}
+		timeout = netDialer.Timeout
 	}
 
-	c, err := New(conn)
+	c, err := NewWithTimeout(conn, timeout)
 	if err != nil {
 		return nil, err
 	}
@@ -677,14 +685,16 @@ func DialWithDialerTLS(dialer Dialer, addr string, tlsConfig *tls.Config) (*Clie
 	// there is no way to set the client's Timeout for that action. As a
 	// workaround, if the dialer has a timeout set, use that for the connection's
 	// deadline.
+	var timeout time.Duration
 	if netDialer, ok := dialer.(*net.Dialer); ok && netDialer.Timeout > 0 {
 		err := tlsConn.SetDeadline(time.Now().Add(netDialer.Timeout))
 		if err != nil {
 			return nil, err
 		}
+		timeout = netDialer.Timeout
 	}
 
-	c, err := New(tlsConn)
+	c, err := NewWithTimeout(tlsConn, timeout)
 	if err != nil {
 		return nil, err
 	}