From: Vsevolod Stakhov Date: Wed, 9 Sep 2015 13:36:53 +0000 (+0100) Subject: Turn on folding for now as gmime breaks everything. X-Git-Tag: 1.0.0~63 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f1db5390c4db96d4a1bc595b91ecb11cb368911;p=rspamd.git Turn on folding for now as gmime breaks everything. --- diff --git a/src/client/rspamc.c b/src/client/rspamc.c index 906eb568f..1ac8a4397 100644 --- 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 29c7092bf..fb36e0073 100644 --- 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