Commit 02861b4

authored

Merge pull request #238 from nhooyr/dev

Fix deadlock introduced in v1.8.5

2 parents 34417b2 + 03cca81 commit 02861b4Copy full SHA for 02861b4

File tree

+18

-7

lines changed

+18

-7

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 17 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,13 +246,24 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco`
`246`	`246`	`if err != nil {`
`247`	`247`	`return 0, err`
`248`	`248`	`}`
`249`		`- defer func() {`
`250`		`- // We leave it locked when writing the close frame to avoid`
`251`		`- // any other goroutine writing any other frame.`
`252`		`- if opcode != opClose {`
`253`		`- c.writeFrameMu.unlock()`
	`249`	`+ defer c.writeFrameMu.unlock()`
	`250`	`+`
	`251`	`+ // If the state says a close has already been written, we wait until`
	`252`	`+ // the connection is closed and return that error.`
	`253`	`+ //`
	`254`	`+ // However, if the frame being written is a close, that means its the close from`
	`255`	`+ // the state being set so we let it go through.`
	`256`	`+ c.closeMu.Lock()`
	`257`	`+ wroteClose := c.wroteClose`
	`258`	`+ c.closeMu.Unlock()`
	`259`	`+ if wroteClose && opcode != opClose {`
	`260`	`+ select {`
	`261`	`+ case <-ctx.Done():`
	`262`	`+ return 0, ctx.Err()`
	`263`	`+ case <-c.closed:`
	`264`	`+ return 0, c.closeErr`
`254`	`265`	`}`
`255`		`- }()`
	`266`	`+ }`
`256`	`267`
`257`	`268`	`select {`
`258`	`269`	`case <-c.closed:`

Comments

(0)