From 4a7ddcd4cf07558dbe56b6c00b75337894afe7df Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Fri, 6 Dec 2019 17:52:44 +0300
Subject: [PATCH] Upgrade Tomcat to 9.0.29

---
 .../jvm/src/io/ktor/server/testing/EngineTestSuite.kt | 11 +++++++----
 ktor-server/ktor-server-tomcat/build.gradle           |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ktor-server/ktor-server-test-host/jvm/src/io/ktor/server/testing/EngineTestSuite.kt b/ktor-server/ktor-server-test-host/jvm/src/io/ktor/server/testing/EngineTestSuite.kt
index 7891a38f7..d856e8793 100644
--- a/ktor-server/ktor-server-test-host/jvm/src/io/ktor/server/testing/EngineTestSuite.kt
+++ b/ktor-server/ktor-server-test-host/jvm/src/io/ktor/server/testing/EngineTestSuite.kt
@@ -857,10 +857,13 @@ abstract class EngineTestSuite<TEngine : ApplicationEngine, TConfiguration : App
             }
 
             val responses = s.getInputStream().bufferedReader(Charsets.ISO_8859_1).lineSequence()
-                .filterNot {
-                    it.startsWith("Date") || it.startsWith("Server") || it.startsWith("Content-") || it.toIntOrNull() != null || it.isBlank() || it.startsWith(
-                        "Connection"
-                    )
+                .filterNot { line ->
+                    line.startsWith("Date") || line.startsWith("Server")
+                        || line.startsWith("Content-")
+                        || line.toIntOrNull() != null
+                        || line.isBlank()
+                        || line.startsWith("Connection")
+                        || line.startsWith("Keep-Alive")
                 }
                 .map { it.trim() }
                 .joinToString(separator = "\n").replace("200 OK", "200")
diff --git a/ktor-server/ktor-server-tomcat/build.gradle b/ktor-server/ktor-server-tomcat/build.gradle
index e5b9070b1..4f5ddf874 100644
--- a/ktor-server/ktor-server-tomcat/build.gradle
+++ b/ktor-server/ktor-server-tomcat/build.gradle
@@ -4,8 +4,8 @@ kotlin.sourceSets {
     jvmMain.dependencies {
         api project(':ktor-server:ktor-server-host-common')
         api project(':ktor-server:ktor-server-servlet')
-        api group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '9.0.10'
-        api group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.10'
+        api group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '9.0.29'
+        api group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.29'
     }
     jvmTest.dependencies {
         api project(':ktor-server:ktor-server-test-host')