KTOR-7278: fixed ContentType match

ktorio · Nov 5, 2024 · 42bddad · 42bddad
1 parent b9f692c
commit 42bddad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/ktor-http/common/src/io/ktor/http/ContentTypes.kt b/ktor-http/common/src/io/ktor/http/ContentTypes.kt
@@ -60,7 +60,8 @@ public class ContentType private constructor(
             return false
         }
 
-        if (pattern.contentSubtype != "*" && !pattern.contentSubtype.equals(contentSubtype, ignoreCase = true)) {
+        if (pattern.contentSubtype != "*" && contentSubtype != "*"
+            && !pattern.contentSubtype.equals(contentSubtype, ignoreCase = true)) {
             return false
         }
 

diff --git a/ktor-server/ktor-server-core/common/src/io/ktor/server/routing/RouteSelector.kt b/ktor-server/ktor-server-core/common/src/io/ktor/server/routing/RouteSelector.kt
@@ -599,9 +599,7 @@ public data class HttpMultiAcceptRouteSelector(
                 return RouteSelectorEvaluation.Missing
             }
 
-            val header = parsedHeaders.firstOrNull { header ->
-                contentTypes.any { ContentType.parse(header.value).match(it) }
-            }
+            val header = parsedHeaders.firstOrNull { header -> contentTypes.any { it.match(header.value) } }
             if (header != null) {
                 return RouteSelectorEvaluation.Success(header.quality)
             }