KTOR-5099 Fix memory leak in HttpRequestRetry plugin (#3316)

ktorio · Jan 10, 2023 · d02c59f · d02c59f
1 parent c6e8173
commit d02c59f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/HttpRequestRetry.kt b/ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/HttpRequestRetry.kt
@@ -327,8 +327,11 @@ public class HttpRequestRetry internal constructor(configuration: Configuration)
 
     private fun prepareRequest(request: HttpRequestBuilder): HttpRequestBuilder {
         val subRequest = HttpRequestBuilder().takeFrom(request)
-        val subRequestJob = Job(request.executionContext)
-        subRequest.executionContext = subRequestJob
+        request.executionContext.invokeOnCompletion { cause ->
+            val subRequestJob = subRequest.executionContext as CompletableJob
+            if (cause == null) subRequestJob.complete()
+            else subRequestJob.completeExceptionally(cause)
+        }
         return subRequest
     }