diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-16 13:43:02 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-16 13:43:02 -0800 |
commit | 791129de2fa7db22ee2b23b97d4040c288110e97 (patch) | |
tree | 5976a456548fce8beb79014c7c2780afeea89a8a /Godeps/_workspace/src/github.com/gorilla/websocket/client.go | |
parent | f08deca79f24ff1efe086483a091cf807a5a2e14 (diff) | |
parent | f54936467101bb08bbdf7f3d9c341134c06b83c3 (diff) | |
download | chat-791129de2fa7db22ee2b23b97d4040c288110e97.tar.gz chat-791129de2fa7db22ee2b23b97d4040c288110e97.tar.bz2 chat-791129de2fa7db22ee2b23b97d4040c288110e97.zip |
Merge pull request #1742 from mattermost/update-golang-deps
Updating go dependancies
Diffstat (limited to 'Godeps/_workspace/src/github.com/gorilla/websocket/client.go')
-rw-r--r-- | Godeps/_workspace/src/github.com/gorilla/websocket/client.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/client.go b/Godeps/_workspace/src/github.com/gorilla/websocket/client.go index 3bf9b2e84..613890603 100644 --- a/Godeps/_workspace/src/github.com/gorilla/websocket/client.go +++ b/Godeps/_workspace/src/github.com/gorilla/websocket/client.go @@ -95,13 +95,20 @@ func parseURL(s string) (*url.URL, error) { return nil, errMalformedURL } - u.Host = s - u.Opaque = "/" + if i := strings.Index(s, "?"); i >= 0 { + u.RawQuery = s[i+1:] + s = s[:i] + } + if i := strings.Index(s, "/"); i >= 0 { - u.Host = s[:i] u.Opaque = s[i:] + s = s[:i] + } else { + u.Opaque = "/" } + u.Host = s + if strings.Contains(u.Host, "@") { // Don't bother parsing user information because user information is // not allowed in websocket URIs. |