clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-29 22:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

websocket: remove use of container/vector

Browse Source 
R=golang-dev, r
CC=golang-dev, ukai
https://golang.org/cl/5140046
This commit is contained in:
Russ Cox 2011-09-26 19:52:34 -04:00
parent c68ae9d467
commit aeaa817140
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pkg/websocket/hixie.go
View File

@ -10,7 +10,6 @@ package websocket
import (
"bufio"
"bytes"
"container/vector"
"crypto/md5"
"encoding/binary"
"fmt"
@ -348,16 +347,17 @@ func hixie76ClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer)
bw.WriteString("GET " + config.Location.RawPath + " 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: " + config.Location.Host + "\r\n")
fields.Push("Origin: " + config.Origin.String() + "\r\n")
fields := []string{
"Upgrade: WebSocket\r\n",
"Connection: Upgrade\r\n",
"Host: " + config.Location.Host + "\r\n",
"Origin: " + config.Origin.String() + "\r\n",
}
if len(config.Protocol) > 0 {
if len(config.Protocol) != 1 {
return ErrBadWebSocketProtocol
}
fields.Push("Sec-WebSocket-Protocol: " + config.Protocol[0] + "\r\n")
fields = append(fields, "Sec-WebSocket-Protocol: "+config.Protocol[0]+"\r\n")
}
// TODO(ukai): Step 15. send cookie if any.
@ -378,8 +378,8 @@ func hixie76ClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer)
}
number2 = uint32(n)
}
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++ {