Fix client cookies remove

tommytroen · Aug 17, 2020 · 7a7de50 · 7a7de50
1 parent e37efd5
commit 7a7de50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/HttpCookies.kt b/ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/HttpCookies.kt
@@ -73,6 +73,8 @@ class HttpCookies(
                 with(context) {
                     if (cookies.isNotEmpty()) {
                         headers[HttpHeaders.Cookie] = renderClientCookies(cookies)
+                    } else {
+                        headers.remove(HttpHeaders.Cookie)
                     }
                 }
             }

diff --git a/ktor-features/ktor-auth/jvm/test/io/ktor/tests/auth/SessionAuthTest.kt b/ktor-features/ktor-auth/jvm/test/io/ktor/tests/auth/SessionAuthTest.kt
@@ -6,7 +6,6 @@ package io.ktor.tests.auth
 
 import io.ktor.application.*
 import io.ktor.auth.*
-import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.features.cookies.*
 import io.ktor.client.request.*
@@ -15,7 +14,6 @@ import io.ktor.http.*
 import io.ktor.response.*
 import io.ktor.routing.*
 import io.ktor.server.testing.*
-import io.ktor.server.testing.client.*
 import io.ktor.sessions.*
 import kotlinx.coroutines.*
 import kotlin.test.*
@@ -28,7 +26,7 @@ class SessionAuthTest {
                 cookie<MySession>("S")
             }
             application.install(Authentication) {
-                session<MySession>() {
+                session<MySession> {
                     validate { it }
                     challenge {
                         call.respond(UnauthorizedResponse())