Skip to content

Commit cc3f4b8

Browse files
committed
Update mime.types
This commit updates mime.types based on revision 1918129 of https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types. Closes gh-33512
1 parent 413cbca commit cc3f4b8

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

spring-web/src/main/resources/org/springframework/http/mime.types

+12-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Internet media types should be registered as described in RFC 4288.
1212
# The registry is at <https://www.iana.org/assignments/media-types/>.
1313
#
14-
# This file was retrieved from https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?revision=1752884&view=co
14+
# This file was retrieved from https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?revision=1918129&view=co
1515
#
1616
# MIME type (lowercased) Extensions
1717
# ============================================ ==========
@@ -36,7 +36,6 @@ application/emma+xml emma
3636
application/epub+zip epub
3737
application/exi exi
3838
application/font-tdpfr pfr
39-
application/font-woff woff
4039
application/gml+xml gml
4140
application/gpx+xml gpx
4241
application/gxf gxf
@@ -221,6 +220,7 @@ application/vnd.fujixerox.docuworks.binder xbd
221220
application/vnd.fuzzysheet fzs
222221
application/vnd.genomatix.tuxedo txd
223222
application/vnd.geogebra.file ggb
223+
application/vnd.geogebra.slides ggs
224224
application/vnd.geogebra.tool ggt
225225
application/vnd.geometry-explorer gex gre
226226
application/vnd.geonext gxt
@@ -481,6 +481,7 @@ application/vnd.yellowriver-custom-menu cmp
481481
application/vnd.zul zir zirz
482482
application/vnd.zzazz.deck+xml zaz
483483
application/voicexml+xml vxml
484+
application/wasm wasm
484485
application/widget wgt
485486
application/winhlp hlp
486487
application/wsdl+xml wsdl
@@ -518,10 +519,8 @@ application/x-eva eva
518519
application/x-font-bdf bdf
519520
application/x-font-ghostscript gsf
520521
application/x-font-linux-psf psf
521-
application/x-font-otf otf
522522
application/x-font-pcf pcf
523523
application/x-font-snf snf
524-
application/x-font-ttf ttf ttc
525524
application/x-font-type1 pfa pfb pfm afm
526525
application/x-freearc arc
527526
application/x-futuresplash spl
@@ -607,7 +606,7 @@ audio/basic au snd
607606
audio/midi mid midi kar rmi
608607
audio/mp4 m4a mp4a
609608
audio/mpeg mpga mp2 mp2a mp3 m2a m3a
610-
audio/ogg oga ogg spx
609+
audio/ogg oga ogg spx opus
611610
audio/s3m s3m
612611
audio/silk sil
613612
audio/vnd.dece.audio uva uvva
@@ -640,6 +639,12 @@ chemical/x-cmdf cmdf
640639
chemical/x-cml cml
641640
chemical/x-csml csml
642641
chemical/x-xyz xyz
642+
font/collection ttc
643+
font/otf otf
644+
font/ttf ttf
645+
font/woff woff
646+
font/woff2 woff2
647+
image/avif avif
643648
image/bmp bmp
644649
image/cgm cgm
645650
image/g3fax g3
@@ -693,7 +698,6 @@ model/vnd.collada+xml dae
693698
model/vnd.dwf dwf
694699
model/vnd.gdl gdl
695700
model/vnd.gtw gtw
696-
model/vnd.mts mts
697701
model/vnd.vtu vtu
698702
model/vrml wrl vrml
699703
model/x3d+binary x3db x3dbz
@@ -704,7 +708,7 @@ text/calendar ics ifb
704708
text/css css
705709
text/csv csv
706710
text/html html htm
707-
text/javascript js
711+
text/javascript js mjs
708712
text/n3 n3
709713
text/plain txt text conf def list log in
710714
text/prs.lines.tag dsc
@@ -748,6 +752,7 @@ video/h264 h264
748752
video/jpeg jpgv
749753
video/jpm jpm jpgm
750754
video/mj2 mj2 mjp2
755+
video/mp2t ts m2t m2ts mts
751756
video/mp4 mp4 mp4v mpg4
752757
video/mpeg mpeg mpg mpe m1v m2v
753758
video/ogg ogv

spring-web/src/test/java/org/springframework/http/MediaTypeFactoryTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/**
2626
* @author Arjen Poutsma
27+
* @author Sebastien Deleuze
2728
*/
2829
class MediaTypeFactoryTests {
2930

@@ -32,6 +33,7 @@ void getMediaType() {
3233
assertThat(MediaTypeFactory.getMediaType("file.xml")).contains(MediaType.APPLICATION_XML);
3334
assertThat(MediaTypeFactory.getMediaType("file.js")).contains(MediaType.parseMediaType("text/javascript"));
3435
assertThat(MediaTypeFactory.getMediaType("file.css")).contains(MediaType.parseMediaType("text/css"));
36+
assertThat(MediaTypeFactory.getMediaType("file.wasm")).contains(MediaType.parseMediaType("application/wasm"));
3537
assertThat(MediaTypeFactory.getMediaType("file.foobar")).isNotPresent();
3638
}
3739

0 commit comments

Comments
 (0)