diff options
| author | Wim <wim@42.be> | 2017-03-25 20:45:10 +0100 |
|---|---|---|
| committer | Wim <wim@42.be> | 2017-03-25 20:45:10 +0100 |
| commit | 07fd825349e8b7e86f8afb3843cb8e2c2afc7c74 (patch) | |
| tree | ea4b33872a5b925fa0ecd2b421f8f073ba22b2cc /vendor/golang.org/x/net/websocket/client.go | |
| parent | be15cc8a36ed3c207251f9b92815781f2fa8618d (diff) | |
| download | matterbridge-msglm-07fd825349e8b7e86f8afb3843cb8e2c2afc7c74.tar.gz matterbridge-msglm-07fd825349e8b7e86f8afb3843cb8e2c2afc7c74.tar.bz2 matterbridge-msglm-07fd825349e8b7e86f8afb3843cb8e2c2afc7c74.zip | |
Update vendor
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 20d1e1e3..69a4ac7e 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() |