Fixes for r78201:

[lhc/web/wiklou.git] / includes / mime.types

diff --git a/includes/mime.types b/includes/mime.types
index a76dd85..bf8c6dd 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -2,7 +2,7 @@ application/andrew-inset ez
 application/mac-binhex40 hqx
 application/mac-compactpro cpt
 application/mathml+xml mathml
-application/msword doc docx docm dot dotx dotm
+application/msword doc dot
 application/octet-stream bin dms lha lzh exe class so dll
 application/oda oda
 application/ogg ogx ogg ogm ogv oga spx
@@ -13,8 +13,8 @@ application/smil smi smil
 application/srgs gram
 application/srgs+xml grxml
 application/vnd.mif mif
-application/vnd.ms-excel xls xlsx xlsb xlam xltx xltm
-application/vnd.ms-powerpoint ppt pptm pptx pot potx potm ppsm ppam
+application/vnd.ms-excel xls xlt xla
+application/vnd.ms-powerpoint ppt pot pps ppa
 application/vnd.wap.wbxml wbxml
 application/vnd.wap.wmlc wmlc
 application/vnd.wap.wmlscriptc wmlsc
@@ -64,7 +64,9 @@ audio/basic au snd
 audio/midi mid midi kar
 audio/mpeg mpga mp2 mp3
 audio/ogg oga ogg spx
+audio/webm webm
 audio/x-aiff aif aiff aifc
+audio/x-matroska mka mkv
 audio/x-mpegurl m3u
 audio/x-ogg oga ogg spx
 audio/x-pn-realaudio ram rm
@@ -78,11 +80,12 @@ image/cgm cgm
 image/gif gif
 image/ief ief
 image/jpeg jpeg jpg jpe
-image/png png
+image/png png apng
 image/svg+xml svg
 image/tiff tiff tif
 image/vnd.djvu djvu djv
 image/vnd.wap.wbmp wbmp
+image/webp webp
 image/x-cmu-raster ras
 image/x-icon ico
 image/x-ms-bmp bmp
@@ -114,7 +117,9 @@ video/mpeg mpeg mpg mpe
 video/ogg ogv ogm ogg
 video/quicktime qt mov
 video/vnd.mpegurl mxu
+video/webm webm
 video/x-flv flv
+video/x-matroska mkv mka
 video/x-msvideo avi
 video/x-ogg ogv ogm ogg
 video/x-sgi-movie movie
@@ -135,3 +140,23 @@ application/vnd.oasis.opendocument.formula odf
 application/vnd.oasis.opendocument.formula-template otf
 application/vnd.oasis.opendocument.text-master odm
 application/vnd.oasis.opendocument.text-web oth
+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
+application/vnd.ms-word.document.macroEnabled.12 docm
+application/vnd.ms-word.template.macroEnabled.12 dotm
+application/vnd.openxmlformats-officedocument.presentationml.template potx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 potm
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
+application/vnd.ms-excel.template.macroEnabled.12 xltm
+application/vnd.ms-excel.addin.macroEnabled.12 xlam
+application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb
+model/vnd.dwfx+xps dwfx
+application/vnd.ms-xpsdocument xps
+application/x-opc+zip docx dotx docm dotm potx ppsx pptx ppam pptm potm ppsm xlsx xltx xlsm xltm xlam xlsb dwfx xps