github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send ping frame using specified encoding

Browse Source 
If base-64 encoding was requested, send the ping frame as a 0-length text frame, rather than as a 0-length binary frame.
This commit is contained in:
Jordan Liggitt
2016-08-25 14:24:59 -04:00
parent d836b248b2
commit 8b1a00b6d9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/util/wsstream/stream.go
View File

@@ -143,10 +143,16 @@ func messageCopy(ws *websocket.Conn, r io.Reader, base64Encode, ping bool, timeo
buf := make([]byte, 2048) buf := make([]byte, 2048)
if ping { if ping {
resetTimeout(ws, timeout) resetTimeout(ws, timeout)
if base64Encode {
if err := websocket.Message.Send(ws, ""); err != nil {
return err
}
} else {
if err := websocket.Message.Send(ws, []byte{}); err != nil { if err := websocket.Message.Send(ws, []byte{}); err != nil {
return err return err
} }
} }
}
for { for {
resetTimeout(ws, timeout) resetTimeout(ws, timeout)
n, err := r.Read(buf) n, err := r.Read(buf)