Merge pull request #665 from DrewCarlson/drew/js-rebase

Properly construct request headers in JS engine
ktorio · Oct 22, 2018 · 9420e0e · 9420e0e
2 parents e788f34 + 42b5958
commit 9420e0e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ktor-client/ktor-client-core/ktor-client-core-js/src/io/ktor/client/engine/js/JsUtils.kt b/ktor-client/ktor-client-core/ktor-client-core-js/src/io/ktor/client/engine/js/JsUtils.kt
@@ -1,5 +1,6 @@
 package io.ktor.client.engine.js
 
+import io.ktor.client.engine.mergeHeaders
 import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.http.content.*
@@ -13,8 +14,8 @@ import kotlin.coroutines.*
 
 internal suspend fun HttpRequest.toRaw(): RequestInit {
  val jsHeaders = js("({})")
- headers.forEach { key, values ->
- jsHeaders[key] = values
+ mergeHeaders(headers, content) { key, value ->
+ jsHeaders[key] = value
  }
 
  val content = content