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

Don't close FD on write errors

This commit is contained in:
kiranrg 2016-10-27 14:17:55 -07:00
parent 6257d10a8b
commit 08e34ffb83
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conn.go
View File

@ -177,6 +177,7 @@ var (
errBadWriteOpCode = errors.New("websocket: bad write message type") errBadWriteOpCode = errors.New("websocket: bad write message type")
errWriteClosed = errors.New("websocket: write closed") errWriteClosed = errors.New("websocket: write closed")
errInvalidControlFrame = errors.New("websocket: invalid control frame") errInvalidControlFrame = errors.New("websocket: invalid control frame")
errPartialWrite = errors.New("websocket: partial write")
) )
func hideTempErr(err error) error { func hideTempErr(err error) error {
@ -322,13 +323,12 @@ func (c *Conn) write(frameType int, deadline time.Time, bufs ...[]byte) error {
for _, buf := range bufs { for _, buf := range bufs {
if len(buf) > 0 { if len(buf) > 0 {
n, err := c.conn.Write(buf) n, err := c.conn.Write(buf)
if n != len(buf) {
// Close on partial write.
c.conn.Close()
}
if err != nil { if err != nil {
return err return err
} }
if n != len(buf) {
return errPartialWrite
}
} }
} }
return nil return nil
@ -387,8 +387,8 @@ func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) er
c.conn.SetWriteDeadline(deadline) c.conn.SetWriteDeadline(deadline)
n, err := c.conn.Write(buf) n, err := c.conn.Write(buf)
if n != 0 && n != len(buf) { if err == nil && n != 0 && n != len(buf) {
c.conn.Close() err = errPartialWrite
} }
return hideTempErr(err) return hideTempErr(err)
} }