diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-05-23 09:45:29 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-05-23 11:04:16 +0200 |
| commit | 4e5e42a1c1a9eb757743648c48df70cbd42635db (patch) | |
| tree | 64220a5cf0a1ad27206bbcdbc810ea56ba5ed67f /src/pkg/websocket | |
| parent | fd089e27d7260cee1c7ca449c41cdd0341ebc6cb (diff) | |
| download | golang-4e5e42a1c1a9eb757743648c48df70cbd42635db.tar.gz | |
Imported Upstream version 2011.05.22
Diffstat (limited to 'src/pkg/websocket')
| -rw-r--r-- | src/pkg/websocket/client.go | 4 | ||||
| -rw-r--r-- | src/pkg/websocket/websocket_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go index 78c8b7f57..3712c2d1b 100644 --- a/src/pkg/websocket/client.go +++ b/src/pkg/websocket/client.go @@ -235,7 +235,7 @@ func handshake(resourceName, host, origin, location, protocol string, br *bufio. } // Step 28-29, 32-40. read response from server. - resp, err := http.ReadResponse(br, "GET") + resp, err := http.ReadResponse(br, &http.Request{Method: "GET"}) if err != nil { return err } @@ -297,7 +297,7 @@ func draft75handshake(resourceName, host, origin, location, protocol string, br } bw.WriteString("\r\n") bw.Flush() - resp, err := http.ReadResponse(br, "GET") + resp, err := http.ReadResponse(br, &http.Request{Method: "GET"}) if err != nil { return } diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go index 10f88dfd1..84788b416 100644 --- a/src/pkg/websocket/websocket_test.go +++ b/src/pkg/websocket/websocket_test.go @@ -150,7 +150,7 @@ func TestHTTP(t *testing.T) { // If the client did not send a handshake that matches the protocol // specification, the server should abort the WebSocket connection. - _, _, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr)) + _, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr)) if err == nil { t.Error("Get: unexpected success") return @@ -169,7 +169,7 @@ func TestHTTP(t *testing.T) { func TestHTTPDraft75(t *testing.T) { once.Do(startServer) - r, _, err := http.Get(fmt.Sprintf("http://%s/echoDraft75", serverAddr)) + r, err := http.Get(fmt.Sprintf("http://%s/echoDraft75", serverAddr)) if err != nil { t.Errorf("Get: error %#v", err) return |