mirror
/
websocket
mirror of https://github.com/gorilla/websocket.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gorilla/websocket

This commit is contained in:
CMGS 2014-09-16 16:37:30 +08:00
parent d3abc342e8 a6f041ac33
commit 078e38de3b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/chat/conn.go
View File

@ -88,7 +88,7 @@ func (c *connection) writePump() {
} }
} }
// serverWs handles webocket requests from the peer. // serverWs handles websocket requests from the peer.
func serveWs(w http.ResponseWriter, r *http.Request) { func serveWs(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
http.Error(w, "Method not allowed", 405) http.Error(w, "Method not allowed", 405)

2
json.go
View File

@ -38,7 +38,7 @@ func ReadJSON(c *Conn, v interface{}) error {
// ReadJSON reads the next JSON-encoded message from the connection and stores // ReadJSON reads the next JSON-encoded message from the connection and stores
// it in the value pointed to by v. // it in the value pointed to by v.
// //
// See the documentation for the encoding/json Marshal function for details // See the documentation for the encoding/json Unmarshal function for details
// about the conversion of JSON to a Go value. // about the conversion of JSON to a Go value.
func (c *Conn) ReadJSON(v interface{}) error { func (c *Conn) ReadJSON(v interface{}) error {
_, r, err := c.NextReader() _, r, err := c.NextReader()

3
server.go
View File

@ -137,6 +137,9 @@ func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeade
} }
var rw *bufio.ReadWriter var rw *bufio.ReadWriter
netConn, rw, err = h.Hijack() netConn, rw, err = h.Hijack()
if err != nil {
return u.returnError(w, r, http.StatusInternalServerError, err.Error())
}
br = rw.Reader br = rw.Reader
if br.Buffered() > 0 { if br.Buffered() > 0 {