File tree Expand file tree Collapse file tree 2 files changed +3
-28
lines changed
Expand file tree Collapse file tree 2 files changed +3
-28
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ package io.ktor.http
66
77import 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
1111private val rawMimes: String
1212 get() = """
@@ -731,6 +731,7 @@ audio/x-au,au
731731audio/x-gsm,gsd gsm
732732audio/x-jam,jam
733733audio/x-liveaudio,lam
734+ audio/x-matroska,mka
734735audio/x-mid,mid midi
735736audio/x-midi,midi
736737audio/x-mod,mod
@@ -936,9 +937,8 @@ video/jpeg,jpgv
936937video/jpm,jpm
937938video/mj2,mj2
938939video/mp4,m4v mp4
939- application/mp4,mp4
940+ application/mp4,mp4s
940941video/mpeg,m1v m2v mp2 mpe mpeg mpg
941- audio/mpeg,mpg
942942video/msvideo,avi
943943video/ogg,ogv
944944video/quicktime,moov mov qt
@@ -968,7 +968,6 @@ video/x-flv,flv
968968video/x-gl,gl
969969video/x-isvideo,isu
970970video/x-matroska,mkv
971- audio/x-matroska,mkv
972971video/x-motion-jpeg,mjpg
973972video/x-mpeg,mp2
974973video/x-mpeq2a,mp2
Original file line number Diff line number Diff 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" ),
You can’t perform that action at this time.
0 commit comments