aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2021-03-23 10:22:19 +0000
committerGitHub <noreply@github.com>2021-03-23 10:22:19 +0000
commitec88225473072493a0fad76864d25240e75bb5f4 (patch)
tree11a6482853d6f4f30555826394c83751fd2b71a8
parentea11c0e7b1eb27f345680e8b6399a45dea5c4dd7 (diff)
parentdafbeb045d3d51e2544323da6785428389ee7faf (diff)
downloadrspamd-ec88225473072493a0fad76864d25240e75bb5f4.tar.gz
rspamd-ec88225473072493a0fad76864d25240e75bb5f4.zip
Merge pull request #3684 from moisseev/wmf
[Minor] Add Windows Metafile MIME types (RFC 7903)
-rw-r--r--conf/maps.d/mime_types.inc2
-rw-r--r--lualib/lua_mime_types.lua4
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/maps.d/mime_types.inc b/conf/maps.d/mime_types.inc
index d71fa0d90..c4f158d8a 100644
--- a/conf/maps.d/mime_types.inc
+++ b/conf/maps.d/mime_types.inc
@@ -1341,6 +1341,8 @@ image/vnd.tencent.tap 0
image/vnd.valve.source.texture 0
image/vnd.xiff 0
image/vnd.zbrush.pcx 0
+image/wmf 0
+image/x-wmf 0
message/CPIM 0
message/delivery-status 0
message/disposition-notification 0
diff --git a/lualib/lua_mime_types.lua b/lualib/lua_mime_types.lua
index 998d004cf..a03c607d7 100644
--- a/lualib/lua_mime_types.lua
+++ b/lualib/lua_mime_types.lua
@@ -575,7 +575,7 @@ exports.full_extensions_map = {
{"wm", "video/x-ms-wm"},
{"wma", "audio/x-ms-wma"},
{"wmd", "application/x-ms-wmd"},
- {"wmf", "application/x-msmetafile"},
+ {"wmf", {"application/x-msmetafile", "image/wmf", "image/x-wmf"}},
{"wml", "text/vnd.wap.wml"},
{"wmlc", "application/vnd.wap.wmlc"},
{"wmls", "text/vnd.wap.wmlscript"},
@@ -742,4 +742,4 @@ exports.reversed_extensions_map = {
["video/x-msvideo"] = "avi",
}
-return exports \ No newline at end of file
+return exports