jlengrand/ktor
1
0
Fork 0
mirror of https://github.com/jlengrand/ktor.git synced 2026-03-10 08:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Tomcat to 9.0.29

Browse Source
This commit is contained in:
Sergey Mashkov
2019-12-06 17:52:44 +03:00
parent 2c63c85d80
commit 4a7ddcd4cf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ktor-server/ktor-server-test-host/jvm/src/io/ktor/server/testing/EngineTestSuite.kt
View File

@@ -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")

4
ktor-server/ktor-server-tomcat/build.gradle
View File

@@ -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')