Fix a race with c.closed

Author: nhooyr

conn_notjs.go

@@ -127,9 +127,9 @@ func (c *Conn) close(err error) {
 	if c.isClosed() {
 		return
 	}
+	c.setCloseErrLocked(err)
 	close(c.closed)
 	runtime.SetFinalizer(c, nil)
-	c.setCloseErrLocked(err)
 
 	// Have to close after c.closed is closed to ensure any goroutine that wakes up
 	// from the connection being closed also sees that c.closed is closed and returns

conn_test.go

@@ -55,7 +55,7 @@ func TestConn(t *testing.T) {
 				defer c2.Close(websocket.StatusInternalError, "")
 				defer c1.Close(websocket.StatusInternalError, "")
 
-				ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+				ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 				defer cancel()
 
 				echoLoopErr := xsync.Go(func() error {
@@ -142,7 +142,7 @@ func TestConn(t *testing.T) {
 		defer c1.Close(websocket.StatusInternalError, "")
 		defer c2.Close(websocket.StatusInternalError, "")
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
 		c2.CloseRead(ctx)
@@ -242,7 +242,7 @@ func TestConn(t *testing.T) {
 		defer c2.Close(websocket.StatusInternalError, "")
 		defer c1.Close(websocket.StatusInternalError, "")
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
 		n1 := websocket.NetConn(ctx, c1, websocket.MessageBinary)
@@ -298,7 +298,7 @@ func TestConn(t *testing.T) {
 		defer c2.Close(websocket.StatusInternalError, "")
 		defer c1.Close(websocket.StatusInternalError, "")
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
 		n1 := websocket.NetConn(ctx, c1, websocket.MessageBinary)
@@ -333,7 +333,7 @@ func TestConn(t *testing.T) {
 		defer c2.Close(websocket.StatusInternalError, "")
 		defer c1.Close(websocket.StatusInternalError, "")
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
 		echoLoopErr := xsync.Go(func() error {
@@ -381,7 +381,7 @@ func TestConn(t *testing.T) {
 		defer c2.Close(websocket.StatusInternalError, "")
 		defer c1.Close(websocket.StatusInternalError, "")
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
 		echoLoopErr := xsync.Go(func() error {