KTOR-7934 Apply fix for Js target

ktorio · Feb 14, 2025 · 315c1c1 · 315c1c1
1 parent bd652e4
commit 315c1c1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/ktor-client/ktor-client-core/js/src/io/ktor/client/engine/js/JsClientEngine.kt b/ktor-client/ktor-client-core/js/src/io/ktor/client/engine/js/JsClientEngine.kt
@@ -156,7 +156,11 @@ private fun org.w3c.fetch.Headers.mapToKtor(method: HttpMethod, attributes: Attr
         append(key, value)
     }
 
-    dropCompressionHeaders(method, attributes)
+    dropCompressionHeaders(
+        method,
+        attributes,
+        alwaysRemove = PlatformUtils.IS_BROWSER
+    )
 }
 
 /**

diff --git a/...ient/ktor-client-tests/common/test/io/ktor/client/tests/ContentEncodingIntegrationTest.kt b/...ient/ktor-client-tests/common/test/io/ktor/client/tests/ContentEncodingIntegrationTest.kt
@@ -13,20 +13,27 @@ import io.ktor.utils.io.*
 import kotlinx.io.readString
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 private const val TEST_URL = "$TEST_SERVER/compression"
 
 class ContentEncodingIntegrationTest : ClientLoader() {
 
-    // GZipEncoder is implemented only on JVM.
+    // GZipEncoder is implemented only on JVM; implicitly decoded for browser
     @Test
     fun testGzipWithContentLengthWithoutPlugin() = clientTests(only("jvm:*", "web:Js")) {
         test { client ->
             val response = client.get("$TEST_URL/gzip-with-content-length")
-            val content = if (response.headers[HttpHeaders.ContentEncoding] == "gzip") {
-                GZipEncoder.decode(response.bodyAsChannel()).readRemaining().readString()
-            } else {
-                response.bodyAsText()
+            val content = when (response.headers[HttpHeaders.ContentEncoding]) {
+                "gzip" -> GZipEncoder.decode(response.bodyAsChannel()).readRemaining().readString()
+                null -> {
+                    // Content-Length should be removed for browser
+                    if (PlatformUtils.IS_BROWSER) {
+                        assertNull(response.headers[HttpHeaders.ContentLength])
+                    }
+                    response.bodyAsText()
+                }
+                else -> error("Unexpected content encoding: ${response.headers[HttpHeaders.ContentEncoding]}")
             }
 
             assertEquals("Hello, world", content)