Release proper InetSocketAddress

ktorio · Nov 15, 2024 · e78ee9b · e78ee9b
1 parent 6dd3a97
commit e78ee9b
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/ktor-client/ktor-client-cio/jvmAndPosix/src/io/ktor/client/engine/cio/Endpoint.kt b/ktor-client/ktor-client-cio/jvmAndPosix/src/io/ktor/client/engine/cio/Endpoint.kt
@@ -38,8 +38,6 @@ internal class Endpoint(
     private val deliveryPoint: Channel<RequestTask> = Channel()
     private val maxEndpointIdleTime: Long = 2 * config.endpoint.connectTimeout
 
-    private var connectionAddress: InetSocketAddress? = null
-
     private val timeout = launch(coroutineContext + CoroutineName("Endpoint timeout($host:$port)")) {
         try {
             while (true) {
@@ -100,7 +98,7 @@ internal class Endpoint(
         callContext: CoroutineContext
     ): HttpResponseData {
         try {
-            val connection = connect(request)
+            val (address, connection) = connect(request)
             val input = connection.input
             val originOutput = connection.output
 
@@ -118,7 +116,7 @@ internal class Endpoint(
                 } catch (cause: Throwable) {
                     LOGGER.debug("An error occurred while closing connection", cause)
                 } finally {
-                    releaseConnection()
+                    releaseConnection(address)
                 }
             }
 
@@ -182,7 +180,7 @@ internal class Endpoint(
     }
 
     private suspend fun createPipeline(request: HttpRequestData) {
-        val connection = connect(request)
+        val (address, connection) = connect(request)
 
         val pipeline = ConnectionPipeline(
             config.endpoint.keepAliveTime,
@@ -193,11 +191,11 @@ internal class Endpoint(
             coroutineContext
         )
 
-        pipeline.pipelineContext.invokeOnCompletion { releaseConnection() }
+        pipeline.pipelineContext.invokeOnCompletion { releaseConnection(address) }
     }
 
     @Suppress("UNUSED_EXPRESSION")
-    private suspend fun connect(requestData: HttpRequestData): Connection {
+    private suspend fun connect(requestData: HttpRequestData): Pair<InetSocketAddress, Connection> {
         val connectAttempts = config.endpoint.connectAttempts
         val (connectTimeout, socketTimeout) = retrieveTimeouts(requestData)
         var timeoutFails = 0
@@ -211,7 +209,7 @@ internal class Endpoint(
                 val connect: suspend CoroutineScope.() -> Socket = {
                     connectionFactory.connect(address) {
                         this.socketTimeout = socketTimeout
-                    }.also { connectionAddress = address }
+                    }
                 }
 
                 val socket = when (connectTimeout) {
@@ -227,7 +225,7 @@ internal class Endpoint(
                 }
 
                 val connection = socket.connection()
-                if (!secure) return@connect connection
+                if (!secure) return@connect address to connection
 
                 try {
                     if (proxy?.type == ProxyType.HTTP) {
@@ -241,7 +239,7 @@ internal class Endpoint(
                         takeFrom(config.https)
                         serverName = serverName ?: realAddress.hostname
                     }
-                    return tlsSocket.connection()
+                    return address to tlsSocket.connection()
                 } catch (cause: Throwable) {
                     try {
                         socket.close()
@@ -288,8 +286,7 @@ internal class Endpoint(
         return connectTimeout to socketTimeout
     }
 
-    private fun releaseConnection() {
-        val address = connectionAddress ?: return
+    private fun releaseConnection(address: InetSocketAddress) {
         connectionFactory.release(address)
         connections.decrementAndGet()
     }