diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-11-16 19:28:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 19:28:52 -0500 |
| commit | 0135904f7d3e1c0e763adaefe267c736616e3d26 (patch) | |
| tree | c27be7588f98eaea62e0bd0c0087f2b348da9738 /vendor/golang.org/x/net/websocket/client.go | |
| parent | 0b296dd8c2aefefe89787be5cc627d44cf431150 (diff) | |
| download | chat-0135904f7d3e1c0e763adaefe267c736616e3d26.tar.gz chat-0135904f7d3e1c0e763adaefe267c736616e3d26.tar.bz2 chat-0135904f7d3e1c0e763adaefe267c736616e3d26.zip | |
Upgrading server dependancies (#4566)
Diffstat (limited to 'vendor/golang.org/x/net/websocket/client.go')
| -rw-r--r-- | vendor/golang.org/x/net/websocket/client.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/vendor/golang.org/x/net/websocket/client.go b/vendor/golang.org/x/net/websocket/client.go index 20d1e1e38..69a4ac7ee 100644 --- a/vendor/golang.org/x/net/websocket/client.go +++ b/vendor/golang.org/x/net/websocket/client.go @@ -6,7 +6,6 @@ package websocket import ( "bufio" - "crypto/tls" "io" "net" "net/http" @@ -87,20 +86,14 @@ func DialConfig(config *Config) (ws *Conn, err error) { if config.Origin == nil { return nil, &DialError{config, ErrBadWebSocketOrigin} } - switch config.Location.Scheme { - case "ws": - client, err = net.Dial("tcp", parseAuthority(config.Location)) - - case "wss": - client, err = tls.Dial("tcp", parseAuthority(config.Location), config.TlsConfig) - - default: - err = ErrBadScheme + dialer := config.Dialer + if dialer == nil { + dialer = &net.Dialer{} } + client, err = dialWithDialer(dialer, config) if err != nil { goto Error } - ws, err = NewClient(config, client) if err != nil { client.Close() |