Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

container/vector: removed some uses of container/vector in other pkgs

Browse source 
R=gri
CC=golang-dev
https://golang.org/cl/4823054
This commit is contained in:
John Asmuth 2011-07-27 15:23:42 -07:00 • committed by Robert Griesemer
parent 22f71cde6a
commit 2f4632febc
6 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pkg/websocket/client.go
View file

@ -7,7 +7,6 @@ package websocket
import (
"bufio"
"bytes"
"container/vector"
"crypto/tls"
"fmt"
"http"
@ -201,21 +200,21 @@ func handshake(resourceName, host, origin, location, protocol string, br *bufio.
bw.WriteString("GET " + resourceName + " HTTP/1.1\r\n")
// Step 6-14. push request headers in fields.
var fields vector.StringVector
fields.Push("Upgrade: WebSocket\r\n")
fields.Push("Connection: Upgrade\r\n")
fields.Push("Host: " + host + "\r\n")
fields.Push("Origin: " + origin + "\r\n")
var fields []string
fields = append(fields, "Upgrade: WebSocket\r\n")
fields = append(fields, "Connection: Upgrade\r\n")
fields = append(fields, "Host: "+host+"\r\n")
fields = append(fields, "Origin: "+origin+"\r\n")
if protocol != "" {
fields.Push("Sec-WebSocket-Protocol: " + protocol + "\r\n")
fields = append(fields, "Sec-WebSocket-Protocol: "+protocol+"\r\n")
}
// TODO(ukai): Step 15. send cookie if any.
// Step 16-23. generate keys and push Sec-WebSocket-Key<n> in fields.
key1, number1 := generateKeyNumber()
key2, number2 := generateKeyNumber()
fields.Push("Sec-WebSocket-Key1: " + key1 + "\r\n")
fields.Push("Sec-WebSocket-Key2: " + key2 + "\r\n")
fields = append(fields, "Sec-WebSocket-Key1: "+key1+"\r\n")
fields = append(fields, "Sec-WebSocket-Key2: "+key2+"\r\n")
// Step 24. shuffle fields and send them out.
for i := 1; i < len(fields); i++ {