Merge pull request #1586 from WebPlatformForEmbedded/pgorszkowski/2.46/fix_suspending_closed_websocket_in_pagehide

magomez · web-flow · commit 4336cfc84243 · 2025-12-09T11:29:22.000+01:00
[BFCache][WebSocket] don't dispatch error if websocket is closed in p…
diff --git a/Source/WebCore/Modules/websockets/WebSocket.cpp b/Source/WebCore/Modules/websockets/WebSocket.cpp
@@ -503,7 +503,7 @@ void WebSocket::contextDestroyed()
 
 void WebSocket::suspend(ReasonForSuspension reason)
 {
-    if (!m_channel)
+    if (!m_channel || m_state == CLOSING || m_state == CLOSED)
         return;
 
     if (reason == ReasonForSuspension::BackForwardCache) {

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ void WebSocket::contextDestroyed()`
`503`	`503`
`504`	`504`	`void WebSocket::suspend(ReasonForSuspension reason)`
`505`	`505`	`{`
`506`		`- if (!m_channel)`
	`506`	`+ if (!m_channel \|\| m_state == CLOSING \|\| m_state == CLOSED)`
`507`	`507`	`return;`
`508`	`508`
`509`	`509`	`if (reason == ReasonForSuspension::BackForwardCache) {`