From add7257269ba401476dcf92a9369ff6511997893 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:39:03 +0000
Subject: [PATCH 1/2] Update tomcat.jakarta to v10.1.35

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 122418eb13..8a6829d608 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ jetty-alpn-api = "1.1.3.v20160715"
 jetty-alpn-openjdk8 = "9.4.57.v20241219"
 
 tomcat = "9.0.98"
-tomcat-jakarta = "10.1.31"
+tomcat-jakarta = "10.1.35"
 
 apache = "4.1.5"
 apache5 = "5.4.2"

From 642748f8089b99cd9bfb4e61baa51666ad6bd659 Mon Sep 17 00:00:00 2001
From: Osip Fatkullin <osip.fatkullin@jetbrains.com>
Date: Mon, 10 Feb 2025 15:45:16 +0100
Subject: [PATCH 2/2] Unignore testHeadRequest on Tomcat

---
 .../tests/server/tomcat/jakarta/TomcatEngineTest.kt  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ktor-server/ktor-server-tomcat-jakarta/jvm/test/io/ktor/tests/server/tomcat/jakarta/TomcatEngineTest.kt b/ktor-server/ktor-server-tomcat-jakarta/jvm/test/io/ktor/tests/server/tomcat/jakarta/TomcatEngineTest.kt
index 3651305c5e..2dac5eee17 100644
--- a/ktor-server/ktor-server-tomcat-jakarta/jvm/test/io/ktor/tests/server/tomcat/jakarta/TomcatEngineTest.kt
+++ b/ktor-server/ktor-server-tomcat-jakarta/jvm/test/io/ktor/tests/server/tomcat/jakarta/TomcatEngineTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.tests.server.tomcat.jakarta
@@ -46,11 +46,7 @@ class TomcatContentTest : ContentTestSuite<TomcatApplicationEngine, TomcatApplic
         enableHttp2 = false
     }
 
-    /**
-     * Tomcat 9.0.56 issue
-     *
-     * [Report a problem](https://ktor.io/feedback/?fqname=io.ktor.tests.server.tomcat.jakarta.TomcatContentTest.testMultipartFileUpload)
-     */
+    // Tomcat 9.0.56 issue
     @Ignore
     override fun testMultipartFileUpload() {
     }
@@ -71,10 +67,6 @@ class TomcatHttpServerCommonTest :
 
     @Ignore // KTOR-6480
     override fun testErrorInBodyClosesConnectionWithContentLength() {}
-
-    @Ignore
-    override fun testHeadRequest() {
-    }
 }
 
 class TomcatHttpServerJvmTest :