Skip to content

Commit 9493bda

Browse files
authored
KTOR-9201 Correct several file extensions for MIME types (#5262)
1 parent bef333c commit 9493bda

File tree

2 files changed

+3
-28
lines changed

2 files changed

+3
-28
lines changed

ktor-http/common/src/io/ktor/http/Mimes.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package io.ktor.http
66

77
import io.ktor.util.*
88

9-
internal const val INITIAL_MIMES_LIST_SIZE: Int = 1217
9+
internal const val INITIAL_MIMES_LIST_SIZE: Int = 1216
1010

1111
private val rawMimes: String
1212
get() = """
@@ -731,6 +731,7 @@ audio/x-au,au
731731
audio/x-gsm,gsd gsm
732732
audio/x-jam,jam
733733
audio/x-liveaudio,lam
734+
audio/x-matroska,mka
734735
audio/x-mid,mid midi
735736
audio/x-midi,midi
736737
audio/x-mod,mod
@@ -936,9 +937,8 @@ video/jpeg,jpgv
936937
video/jpm,jpm
937938
video/mj2,mj2
938939
video/mp4,m4v mp4
939-
application/mp4,mp4
940+
application/mp4,mp4s
940941
video/mpeg,m1v m2v mp2 mpe mpeg mpg
941-
audio/mpeg,mpg
942942
video/msvideo,avi
943943
video/ogg,ogv
944944
video/quicktime,moov mov qt
@@ -968,7 +968,6 @@ video/x-flv,flv
968968
video/x-gl,gl
969969
video/x-isvideo,isu
970970
video/x-matroska,mkv
971-
audio/x-matroska,mkv
972971
video/x-motion-jpeg,mjpg
973972
video/x-mpeg,mp2
974973
video/x-mpeq2a,mp2

ktor-http/common/test/io/ktor/tests/http/ContentTypeLookupTest.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,6 @@ class ContentTypeLookupTest {
4646
ContentType.fromFileExtension(".zip")
4747
)
4848

49-
assertEquals(
50-
listOf(
51-
ContentType.parse("video/mpeg"),
52-
ContentType.parse("audio/mpeg")
53-
),
54-
ContentType.fromFileExtension(".mpg")
55-
)
56-
57-
assertEquals(
58-
listOf(
59-
ContentType.parse("video/mp4"),
60-
ContentType.parse("application/mp4")
61-
),
62-
ContentType.fromFileExtension(".mp4")
63-
)
64-
65-
assertEquals(
66-
listOf(
67-
ContentType.parse("video/x-matroska"),
68-
ContentType.parse("audio/x-matroska"),
69-
),
70-
ContentType.fromFileExtension(".mkv")
71-
)
72-
7349
assertEquals(
7450
listOf(
7551
ContentType.parse("text/javascript"),

0 commit comments

Comments
 (0)