summaryrefslogtreecommitdiff
path: root/libgo/go/websocket
diff options
context:
space:
mode:
Diffstat (limited to 'libgo/go/websocket')
-rw-r--r--libgo/go/websocket/client.go2
-rw-r--r--libgo/go/websocket/websocket_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/websocket/client.go b/libgo/go/websocket/client.go
index caf63f16f65..09134594405 100644
--- a/libgo/go/websocket/client.go
+++ b/libgo/go/websocket/client.go
@@ -111,7 +111,7 @@ func Dial(url, protocol, origin string) (ws *Conn, err os.Error) {
client, err = net.Dial("tcp", "", parsedUrl.Host)
case "wss":
- client, err = tls.Dial("tcp", "", parsedUrl.Host)
+ client, err = tls.Dial("tcp", "", parsedUrl.Host, nil)
default:
err = ErrBadScheme
diff --git a/libgo/go/websocket/websocket_test.go b/libgo/go/websocket/websocket_test.go
index c66c114589d..cc4b9dc1898 100644
--- a/libgo/go/websocket/websocket_test.go
+++ b/libgo/go/websocket/websocket_test.go
@@ -155,7 +155,7 @@ func TestHTTP(t *testing.T) {
// specification, the server should abort the WebSocket connection.
_, _, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
if err == nil {
- t.Errorf("Get: unexpected success")
+ t.Error("Get: unexpected success")
return
}
urlerr, ok := err.(*http.URLError)