[Minor] Fix various minor issues

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 6d1911b1d797217e923fde96aa64896337b26d25..0d17557411902bdfc8f185d1b446d15999c305c6 100644 (file)
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -166,11 +166,6 @@ reconf['TRACKER_ID'] = {
 }
 
 
--- From that contains encoded characters while base 64 is not needed as all symbols are 7bit
--- Regexp that checks that From header is encoded with base64 (search in raw headers)
-local from_encoded_b64 = 'From=/\\=\\?\\S+\\?B\\?/iX'
--- From contains only 7bit characters (parsed headers are used)
-local from_needs_mime = 'From=/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f-\\xff]/Hr'
 -- Final rule
 reconf['FROM_EXCESS_BASE64'] = {
   re = string.format('%s & !%s', from_encoded_b64, from_needs_mime),
@@ -180,8 +175,6 @@ reconf['FROM_EXCESS_BASE64'] = {
 }
 
 -- From that contains encoded characters while quoted-printable is not needed as all symbols are 7bit
--- Regexp that checks that From header is encoded with quoted-printable (search in raw headers)
-local from_encoded_qp = 'From=/\\=\\?\\S+\\?Q\\?/iX'
 -- Final rule
 reconf['FROM_EXCESS_QP'] = {
   re = string.format('%s & !%s', from_encoded_qp, from_needs_mime),
@@ -192,9 +185,6 @@ reconf['FROM_EXCESS_QP'] = {
 
 -- To that contains encoded characters while base 64 is not needed as all symbols are 7bit
 -- Regexp that checks that To header is encoded with base64 (search in raw headers)
-local to_encoded_b64 = 'To=/\\=\\?\\S+\\?B\\?/iX'
--- To contains only 7bit characters (parsed headers are used)
-local to_needs_mime = 'To=/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f-\\xff]/Hr'
 -- Final rule
 reconf['TO_EXCESS_BASE64'] = {
   re = string.format('%s & !%s', to_encoded_b64, to_needs_mime),
@@ -204,8 +194,6 @@ reconf['TO_EXCESS_BASE64'] = {
 }
 
 -- To that contains encoded characters while quoted-printable is not needed as all symbols are 7bit
--- Regexp that checks that To header is encoded with quoted-printable (search in raw headers)
-local to_encoded_qp = 'To=/\\=\\?\\S+\\?Q\\?/iX'
 -- Final rule
 reconf['TO_EXCESS_QP'] = {
   re = string.format('%s & !%s', to_encoded_qp, to_needs_mime),

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index fd09302120ee10b37310d98f9982028dd858c2d3..a01f42ea6f0c166bbada13d0db7828b50bcb37bf 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -2008,7 +2008,7 @@ rspamd_rcl_config_init (struct rspamd_config *cfg)
        rspamd_rcl_add_default_handler (sub,
                        "enable_experimental",
                        rspamd_rcl_parse_struct_boolean,
-                       G_STRUCT_OFFSET (struct rspamd_config, check_all_filters),
+                       G_STRUCT_OFFSET (struct rspamd_config, enable_experimental),
                        0,
                        "Enable experimental plugins");
        rspamd_rcl_add_default_handler (sub,

diff --git a/test/functional/configs/url_tags.conf b/test/functional/configs/url_tags.conf
index 5c9b42a948beca9589300faaff5126017560aab7..ca3d2e34b4979f379844c9af5b65410f1dc83e09 100644 (file)
--- a/test/functional/configs/url_tags.conf
+++ b/test/functional/configs/url_tags.conf
@@ -3,3 +3,7 @@ url_tags {
 redis {
   servers = "${REDIS_ADDR}:${REDIS_PORT}";
 }
+
+options {
+  enable_experimental = true;
+}