KTOR-6684 Fix duplicate Accept Header in ContentNegotiation (#3984)

ktorio · Mar 1, 2024 · 5fd337e · 5fd337e
1 parent 4633438
commit 5fd337e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/...nt-negotiation/common/src/io/ktor/client/plugins/contentnegotiation/ContentNegotiation.kt b/...nt-negotiation/common/src/io/ktor/client/plugins/contentnegotiation/ContentNegotiation.kt
@@ -140,6 +140,8 @@ public class ContentNegotiation internal constructor(
     internal suspend fun convertRequest(request: HttpRequestBuilder, body: Any): Any? {
         registrations.forEach {
             LOGGER.trace("Adding Accept=${it.contentTypeToSend.contentType} header for ${request.url}")
+
+            if (request.headers.contains(HttpHeaders.Accept, it.contentTypeToSend.toString())) return@forEach
             request.accept(it.contentTypeToSend)
         }
 

diff --git a/...sts/jvm/src/io/ktor/client/plugins/contentnegotiation/tests/JsonContentNegotiationTest.kt b/...sts/jvm/src/io/ktor/client/plugins/contentnegotiation/tests/JsonContentNegotiationTest.kt
@@ -280,6 +280,25 @@ abstract class JsonContentNegotiationTest(val converter: ContentConverter) {
         }
     }
 
+    @Test
+    fun testNoDuplicatedHeaders() = testApplication {
+        install(ContentNegotiation) {
+            register(ContentType.Application.Json, converter)
+        }
+
+        createClient {
+            install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
+                register(ContentType.Application.Json, converter)
+            }
+        }.get {
+            header(HttpHeaders.Accept, "application/json")
+        }.let { response ->
+            response.request.headers.forEach { _, values ->
+                assertEquals(1, values.size)
+            }
+        }
+    }
+
     @Test
     open fun testRespondNestedSealedWithTypeInfoAny() = testApplication {
         install(ContentNegotiation) {