From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 20 Nov 2020 11:23:28 +0000 (+0000)
Subject: [Minor] Lua_content: Allow multiple content types to be matched
X-Git-Tag: 2.7~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=149d5d9ba3fed43562b16911cadf78c53201c0a7;p=thirdparty%2Frspamd.git

[Minor] Lua_content: Allow multiple content types to be matched
---

diff --git a/lualib/lua_content/init.lua b/lualib/lua_content/init.lua
index c23ca9d097..7bf42b9a1a 100644
--- a/lualib/lua_content/init.lua
+++ b/lualib/lua_content/init.lua
@@ -26,9 +26,9 @@ local lua_util = require "lua_util"
 
 local content_modules = {
   ical = {
-    mime_type = "text/calendar",
+    mime_type = {"text/calendar", "application/calendar"},
     module = require "lua_content/ical",
-    extensions = {'ical'},
+    extensions = {'ics'},
     output = "text"
   },
   pdf = {
@@ -47,7 +47,14 @@ local function init()
   modules_by_extension = {}
   for k,v in pairs(content_modules) do
     if v.mime_type then
-      modules_by_mime_type[v.mime_type] = {k, v}
+      if type(v.mime_type) == 'table' then
+        for _,mt in ipairs(v.mime_type) do
+          modules_by_mime_type[mt] = {k, v}
+        end
+      else
+        modules_by_mime_type[v.mime_type] = {k, v}
+      end
+
     end
     if v.extensions then
       for _,ext in ipairs(v.extensions) do