KTOR-8135 Socket accept not throwing error on socket close on native

ktorio · Jan 31, 2025 · cddc1b7 · cddc1b7
1 parent 55106bc
commit cddc1b7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/ktor-network/common/test/io/ktor/network/sockets/tests/TCPSocketTest.kt b/ktor-network/common/test/io/ktor/network/sockets/tests/TCPSocketTest.kt
@@ -165,4 +165,20 @@ class TCPSocketTest {
         serverConnection.close()
         server.close()
     }
+
+    @Test
+    fun testAcceptErrorOnSocketClose() = testSockets { selector ->
+        val socket = aSocket(selector)
+            .tcp()
+            .bind(InetSocketAddress("127.0.0.1", 0))
+
+        launch {
+            assertFailsWith<IOException> {
+                socket.accept()
+            }
+        }
+        delay(100) // Make sure socket is awaiting connection using ACCEPT
+
+        socket.close()
+    }
 }
diff --git a/ktor-network/nix/src/io/ktor/network/selector/SelectUtilsNix.kt b/ktor-network/nix/src/io/ktor/network/selector/SelectUtilsNix.kt
@@ -200,6 +200,7 @@ internal actual class SelectorHelper {
         for (event in watchSet) {
             if (event.descriptor in closeSet) {
                 completed.add(event)
+                event.fail(IOException("Selectable closed"))
                 continue
             }
 

diff --git a/ktor-network/windows/src/io/ktor/network/selector/SelectUtilsWindows.kt b/ktor-network/windows/src/io/ktor/network/selector/SelectUtilsWindows.kt
@@ -10,6 +10,7 @@ import io.ktor.utils.io.*
 import io.ktor.utils.io.errors.*
 import kotlinx.cinterop.*
 import kotlinx.coroutines.*
+import kotlinx.io.IOException
 import platform.posix.*
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -152,6 +153,7 @@ internal actual class SelectorHelper {
         watchSet.forEach { event ->
             if (event.descriptor in closeSet) {
                 completed.add(event)
+                event.fail(IOException("Selectable closed"))
                 return@forEach
             }
             val wsaEvent = wsaEvents.getValue(event.descriptor)