KTOR-6664 Cancel pending incoming messages if the session is closing (#…

…3939) (cherry picked from commit 71738f5)
ktorio · Jan 30, 2024 · 620b4b6 · 620b4b6
1 parent 9d8ff84
commit 620b4b6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/websocket/builders.kt b/ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/websocket/builders.kt
@@ -101,6 +101,7 @@ public suspend fun HttpClient.webSocket(
             block(it)
         } finally {
             it.close()
+            it.incoming.cancel()
         }
     }
 }

diff --git a/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/WebSocketTest.kt b/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/WebSocketTest.kt
@@ -307,4 +307,19 @@ class WebSocketTest : ClientLoader() {
             }
         }
     }
+
+    @Test
+    fun testIncomingOverflow() = clientTests(ENGINES_WITHOUT_WS) {
+        config {
+            install(WebSockets)
+        }
+
+        test { client ->
+            client.webSocket("$TEST_WEBSOCKET_SERVER/websockets/echo") {
+                repeat(1000) {
+                    send("test")
+                }
+            }
+        }
+    }
 }