aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-05-04 18:20:03 +0100
committerGitHub <noreply@github.com>2018-05-04 18:20:03 +0100
commit03b3fef47e695921d7e268dc8108fdd52b97f3c2 (patch)
tree289e8a39b4044df8ef1a65d27cd404bb7e4da556 /src
parentb15c4aa86e35807e89309f0a86d1497499867bb8 (diff)
parent3afe3854bda72e11539e490c7eef5ca56dcff36c (diff)
downloadrspamd-03b3fef47e695921d7e268dc8108fdd52b97f3c2.tar.gz
rspamd-03b3fef47e695921d7e268dc8108fdd52b97f3c2.zip
Merge pull request #2219 from moisseev/patch-1
[Minor] Allow image/pjpeg CT for JPEG compressed images
Diffstat (limited to 'src')
-rw-r--r--src/plugins/lua/mime_types.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/lua/mime_types.lua b/src/plugins/lua/mime_types.lua
index 4f3405d8b..1d6f0a3aa 100644
--- a/src/plugins/lua/mime_types.lua
+++ b/src/plugins/lua/mime_types.lua
@@ -403,9 +403,9 @@ local full_extensions_map = {
{"jfif", "image/pjpeg"},
{"jnlp", "application/x-java-jnlp-file"},
{"jpb", "application/octet-stream"},
- {"jpe", "image/jpeg"},
- {"jpeg", "image/jpeg"},
- {"jpg", "image/jpeg"},
+ {"jpe", {"image/jpeg", "image/pjpeg"}},
+ {"jpeg", {"image/jpeg", "image/pjpeg"}},
+ {"jpg", {"image/jpeg", "image/pjpeg"}},
{"js", "application/javascript"},
{"json", "application/json"},
{"jsx", "text/jscript"},