Turn on folding for now as gmime breaks everything.

diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index 906eb568f283ddd212d0e7a96e3c0a72846e5c1b..1ac8a43977394c83fdc54141546cff68400dafce 100644 (file)
--- a/src/client/rspamc.c
+++ b/src/client/rspamc.c
@@ -953,7 +953,7 @@ rspamc_mime_output (FILE *out, ucl_object_t *result, GString *input, GError *err
 
                folded_symbuf = rspamd_header_value_fold ("X-Spam-Symbols", symbuf->str);
                g_mime_object_append_header (GMIME_OBJECT (message), "X-Spam-Symbols",
-                               folded_symbuf->str);
+                               symbuf->str);
                g_string_free (folded_symbuf, TRUE);
                g_string_free (symbuf, TRUE);
 

diff --git a/test/lua/unit/folding.lua b/test/lua/unit/folding.lua
index 29c7092bf6e527784e4bc52db518d304b3b60618..fb36e0073d4a7949595858bcf469c6cde4ae99a5 100644 (file)
--- a/test/lua/unit/folding.lua
+++ b/test/lua/unit/folding.lua
@@ -46,6 +46,9 @@ context("Headers folding unit test", function()
       {{"Content-Type", "Content-Type: multipart/mixed;\r\n\tboundary=\"---- =_NextPart_000_01BDBF1F.DA8F77EE\" abc def ghfdgfdsgj fdshfgfsdgfdsg hfsdgjfsdg fgsfgjsg"},
         "Content-Type: multipart/mixed;\r\n\tboundary=\"---- =_NextPart_000_01BDBF1F.DA8F77EE\" abc def ghfdgfdsgj\r\n\tfdshfgfsdgfdsg hfsdgjfsdg fgsfgjsg"
       },
+      {{"X-Spam-Symbols", "Returnpath_BL2,HFILTER_FROM_BOUNCE,R_PARTS_DIFFER,R_IP_PBL,R_ONE_RCPT,R_googleredir,R_TO_SEEMS_AUTO,R_SPF_NEUTRAL,R_PRIORITY_3,RBL_SPAMHAUS_PBL,HFILTER_MID_NOT_FQDN,MISSING_CTE,R_HAS_URL,RBL_SPAMHAUS_CSS,RBL_SPAMHAUS_XBL,BAYES_SPAM,RECEIVED_RBL10"},
+      "Returnpath_BL2,HFILTER_FROM_BOUNCE,R_PARTS_DIFFER,\r\n\tR_IP_PBL,R_ONE_RCPT,R_googleredir,R_TO_SEEMS_AUTO,R_SPF_NEUTRAL,R_PRIORITY_3,\r\n\tRBL_SPAMHAUS_PBL,HFILTER_MID_NOT_FQDN,MISSING_CTE,R_HAS_URL,RBL_SPAMHAUS_CSS,\r\n\tRBL_SPAMHAUS_XBL,BAYES_SPAM,RECEIVED_RBL10"
+      },
     }
 
     for _,c in ipairs(cases) do