mirror
/
websocket
mirror of https://github.com/gorilla/websocket.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Add a default handshake timeout of 5 seconds

This commit is contained in:
Pablo Carranza 2018-03-04 12:17:01 +01:00 committed by Gary Burd
parent e426f23f06
commit 196b8d0585
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client.go
View File

@ -41,6 +41,7 @@ func NewClient(netConn net.Conn, u *url.URL, requestHeader http.Header, readBufS
NetDial: func(net, addr string) (net.Conn, error) { NetDial: func(net, addr string) (net.Conn, error) {
return netConn, nil return netConn, nil
}, },
HandshakeTimeout: 5 * time.Second,
} }
return d.Dial(u.String(), requestHeader) return d.Dial(u.String(), requestHeader)
} }
@ -106,7 +107,8 @@ func hostPortNoPort(u *url.URL) (hostPort, hostNoPort string) {
// DefaultDialer is a dialer with all fields set to the default values. // DefaultDialer is a dialer with all fields set to the default values.
var DefaultDialer = &Dialer{ var DefaultDialer = &Dialer{
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,
HandshakeTimeout: 5 * time.Second,
} }
// Dial creates a new client connection. Use requestHeader to specify the // Dial creates a new client connection. Use requestHeader to specify the
@ -122,7 +124,8 @@ func (d *Dialer) Dial(urlStr string, requestHeader http.Header) (*Conn, *http.Re
if d == nil { if d == nil {
d = &Dialer{ d = &Dialer{
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,
HandshakeTimeout: 5 * time.Second,
} }
} }