diff options
Diffstat (limited to 'src/pkg/websocket')
| -rw-r--r-- | src/pkg/websocket/client.go | 8 | ||||
| -rw-r--r-- | src/pkg/websocket/server.go | 2 | ||||
| -rw-r--r-- | src/pkg/websocket/websocket.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go index 3712c2d1b..e28382196 100644 --- a/src/pkg/websocket/client.go +++ b/src/pkg/websocket/client.go @@ -29,7 +29,7 @@ var ( ErrBadWebSocketOrigin = &ProtocolError{"missing or bad WebSocket-Origin"} ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"} ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"} - ErrChallengeResponse = &ProtocolError{"mismatch challange/response"} + ErrChallengeResponse = &ProtocolError{"mismatch challenge/response"} secKeyRandomChars [0x30 - 0x21 + 0x7F - 0x3A]byte ) @@ -226,7 +226,7 @@ func handshake(resourceName, host, origin, location, protocol string, br *bufio. // Step 25. send CRLF. bw.WriteString("\r\n") - // Step 26. genearte 8 bytes random key. + // Step 26. generate 8 bytes random key. key3 := generateKey3() // Step 27. send it out. bw.Write(key3) @@ -262,7 +262,7 @@ func handshake(resourceName, host, origin, location, protocol string, br *bufio. return ErrBadWebSocketProtocol } - // Step 42-43. get expected data from challange data. + // Step 42-43. get expected data from challenge data. expected, err := getChallengeResponse(number1, number2, key3) if err != nil { return err @@ -283,7 +283,7 @@ func handshake(resourceName, host, origin, location, protocol string, br *bufio. } /* -Handhake described in (soon obsolete) +Handshake described in (soon obsolete) draft-hixie-thewebsocket-protocol-75. */ func draft75handshake(resourceName, host, origin, location, protocol string, br *bufio.Reader, bw *bufio.Writer) (err os.Error) { diff --git a/src/pkg/websocket/server.go b/src/pkg/websocket/server.go index 376265236..165cbffee 100644 --- a/src/pkg/websocket/server.go +++ b/src/pkg/websocket/server.go @@ -124,7 +124,7 @@ func (f Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { part1 := keyNumber1 / space1 part2 := keyNumber2 / space2 - // Step 8. let challenge to be concatination of part1, part2 and key3. + // Step 8. let challenge be concatenation of part1, part2 and key3. // Step 9. get MD5 fingerprint of challenge. response, err := getChallengeResponse(part1, part2, key3) if err != nil { diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go index edde61b4a..7447cf852 100644 --- a/src/pkg/websocket/websocket.go +++ b/src/pkg/websocket/websocket.go @@ -158,7 +158,7 @@ func (ws *Conn) SetReadTimeout(nsec int64) os.Error { return os.EINVAL } -// SetWritetTimeout sets the connection's network write timeout in nanoseconds. +// SetWriteTimeout sets the connection's network write timeout in nanoseconds. func (ws *Conn) SetWriteTimeout(nsec int64) os.Error { if conn, ok := ws.rwc.(net.Conn); ok { return conn.SetWriteTimeout(nsec) |