From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 12 Dec 2016 16:44:35 +0000 (+0000)
Subject: [Minor] Further simplifications
X-Git-Tag: 1.5.0~610
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ff2f67f50f5d1c15c64897fc92903e4a8408d7;p=thirdparty%2Frspamd.git

[Minor] Further simplifications
---

diff --git a/src/ragel/content_type.rl b/src/ragel/content_type.rl
index f6763b121d..bbc6d46136 100644
--- a/src/ragel/content_type.rl
+++ b/src/ragel/content_type.rl
@@ -21,11 +21,8 @@
   ietf_token = token+;
   custom_x_token = 'x'i "-" token+;
   extension_token = ietf_token | custom_x_token;
-  discrete_type = 'text'i | 'image'i | 'audio'i | 'video'i |
-                  'application'i | extension_token;
-  composite_type = 'message'i | 'multipart'i | extension_token;
   iana_token = token+;
-  main_type = (discrete_type | composite_type) >Type_Start %Type_End;
+  main_type = (extension_token) >Type_Start %Type_End;
   sub_type = (extension_token | iana_token) >Subtype_Start %Subtype_End;
   content_type = main_type ("/" sub_type)? (((CFWS? ";"+) | CFWS) parameter CFWS?)*;