Skip to content

fix #705 #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix #705 #763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,12 @@ type Conn struct {
subprotocol string

// Write fields
mu chan struct{} // used as mutex to protect write to conn
writeBuf []byte // frame is constructed in this buffer.
writePool BufferPool
writeBufSize int
writeDeadline time.Time
writer io.WriteCloser // the current writer returned to the application
isWriting bool // for best-effort concurrent write detection
mu chan struct{} // used as mutex to protect write to conn
writeBuf []byte // frame is constructed in this buffer.
writePool BufferPool
writeBufSize int
writer io.WriteCloser // the current writer returned to the application
isWriting bool // for best-effort concurrent write detection

writeErrMu sync.Mutex
writeErr error
Expand Down Expand Up @@ -376,7 +375,7 @@ func (c *Conn) read(n int) ([]byte, error) {
return p, err
}

func (c *Conn) write(frameType int, deadline time.Time, buf0, buf1 []byte) error {
func (c *Conn) write(frameType int, buf0, buf1 []byte) error {
<-c.mu
defer func() { c.mu <- struct{}{} }()

Expand All @@ -387,7 +386,6 @@ func (c *Conn) write(frameType int, deadline time.Time, buf0, buf1 []byte) error
return err
}

c.conn.SetWriteDeadline(deadline)
if len(buf1) == 0 {
_, err = c.conn.Write(buf0)
} else {
Expand Down Expand Up @@ -460,7 +458,11 @@ func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) er
return err
}

c.conn.SetWriteDeadline(deadline)
err = c.conn.SetWriteDeadline(deadline)
if err != nil {
return err
}

_, err = c.conn.Write(buf)
if err != nil {
return c.writeFatal(err)
Expand Down Expand Up @@ -618,7 +620,7 @@ func (w *messageWriter) flushFrame(final bool, extra []byte) error {
}
c.isWriting = true

err := c.write(w.frameType, c.writeDeadline, c.writeBuf[framePos:w.pos], extra)
err := c.write(w.frameType, c.writeBuf[framePos:w.pos], extra)

if !c.isWriting {
panic("concurrent write to websocket connection")
Expand Down Expand Up @@ -745,7 +747,7 @@ func (c *Conn) WritePreparedMessage(pm *PreparedMessage) error {
panic("concurrent write to websocket connection")
}
c.isWriting = true
err = c.write(frameType, c.writeDeadline, frameData, nil)
err = c.write(frameType, frameData, nil)
if !c.isWriting {
panic("concurrent write to websocket connection")
}
Expand Down Expand Up @@ -785,8 +787,7 @@ func (c *Conn) WriteMessage(messageType int, data []byte) error {
// all future writes will return an error. A zero value for t means writes will
// not time out.
func (c *Conn) SetWriteDeadline(t time.Time) error {
c.writeDeadline = t
return nil
return c.conn.SetWriteDeadline(t)
}

// Read methods
Expand Down