diff options
Diffstat (limited to 'src/pkg/websocket')
| -rw-r--r-- | src/pkg/websocket/client.go | 9 | ||||
| -rw-r--r-- | src/pkg/websocket/websocket_test.go | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go index f24c46360..74bede424 100644 --- a/src/pkg/websocket/client.go +++ b/src/pkg/websocket/client.go @@ -15,6 +15,7 @@ import ( "os" "rand" "strings" + "url" ) type ProtocolError struct { @@ -99,10 +100,10 @@ A trivial example client: // use msg[0:n] } */ -func Dial(url, protocol, origin string) (ws *Conn, err os.Error) { +func Dial(url_, protocol, origin string) (ws *Conn, err os.Error) { var client net.Conn - parsedUrl, err := http.ParseURL(url) + parsedUrl, err := url.Parse(url_) if err != nil { goto Error } @@ -121,14 +122,14 @@ func Dial(url, protocol, origin string) (ws *Conn, err os.Error) { goto Error } - ws, err = newClient(parsedUrl.RawPath, parsedUrl.Host, origin, url, protocol, client, handshake) + ws, err = newClient(parsedUrl.RawPath, parsedUrl.Host, origin, url_, protocol, client, handshake) if err != nil { goto Error } return Error: - return nil, &DialError{url, protocol, origin, err} + return nil, &DialError{url_, protocol, origin, err} } /* diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go index 84788b416..71c3c8514 100644 --- a/src/pkg/websocket/websocket_test.go +++ b/src/pkg/websocket/websocket_test.go @@ -15,6 +15,7 @@ import ( "net" "sync" "testing" + "url" ) var serverAddr string @@ -155,9 +156,9 @@ func TestHTTP(t *testing.T) { t.Error("Get: unexpected success") return } - urlerr, ok := err.(*http.URLError) + urlerr, ok := err.(*url.Error) if !ok { - t.Errorf("Get: not URLError %#v", err) + t.Errorf("Get: not url.Error %#v", err) return } if urlerr.Error != io.ErrUnexpectedEOF { |