KTOR-4827 Fix CIO response delay (#3150)

4657cb29 · Thomas Vos · GitHub · b9d20b4b · 4657cb29 · 4657cb29
--- a/ktor-network/jvm/src/io/ktor/network/sockets/JavaSocketAddressUtils.kt
+++ b/ktor-network/jvm/src/io/ktor/network/sockets/JavaSocketAddressUtils.kt
@@ -5,6 +5,7 @@
 package io.ktor.network.sockets

 public fun SocketAddress.toJavaAddress(): java.net.SocketAddress {
+    // Do not read the hostname here because that may trigger a name service reverse lookup.
    return address
 }


--- a/ktor-server/ktor-server-cio/jvm/src/io/ktor/server/cio/backend/SocketAddressUtilsJvm.kt
+++ b/ktor-server/ktor-server-cio/jvm/src/io/ktor/server/cio/backend/SocketAddressUtilsJvm.kt
+/*
+ * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.server.cio.backend
+
+import io.ktor.network.sockets.*
+import io.ktor.util.network.*
+
+internal actual fun SocketAddress.toNetworkAddress(): NetworkAddress {
+    // Do not read the hostname here because that may trigger a name service reverse lookup.
+    return toJavaAddress() as? java.net.InetSocketAddress ?: error("Expected inet socket address")
+}
--- a/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/backend/SocketAddressUtils.kt
+++ b/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/backend/SocketAddressUtils.kt
@@ -13,7 +13,4 @@ internal val SocketAddress.port: Int
        return inetAddress.port
    }

-internal fun SocketAddress.toNetworkAddress(): NetworkAddress {
-    val inetAddress = this as? InetSocketAddress ?: error("Expected inet socket address")
-    return NetworkAddress(inetAddress.hostname, inetAddress.port)
-}
+internal expect fun SocketAddress.toNetworkAddress(): NetworkAddress
--- a/ktor-server/ktor-server-cio/nix/src/io/ktor/server/cio/backend/SocketAddressUtilsNative.kt
+++ b/ktor-server/ktor-server-cio/nix/src/io/ktor/server/cio/backend/SocketAddressUtilsNative.kt
+/*
+ * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.server.cio.backend
+
+import io.ktor.network.sockets.*
+import io.ktor.util.network.*
+
+internal actual fun SocketAddress.toNetworkAddress(): NetworkAddress {
+    val inetAddress = this as? InetSocketAddress ?: error("Expected inet socket address")
+    return NetworkAddress(inetAddress.hostname, inetAddress.port)
+}