From 73adbf798117f119ae21957951528cba4a684418 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 15 Nov 2024 09:00:42 +0000 Subject: [PATCH] [Fix] Milter headers: fold before encoding --- src/plugins/lua/milter_headers.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua index 58a227fec..2daeeed78 100644 --- a/src/plugins/lua/milter_headers.lua +++ b/src/plugins/lua/milter_headers.lua @@ -213,16 +213,17 @@ local function milter_headers(task) if not add[hname] then add[hname] = {} end + local folded = lua_util.fold_header(task, hname, value, stop_chars) if rspamd_config:is_mime_utf8() then - if not rspamd_util.is_valid_utf8(value) then - value = rspamd_util.mime_header_encode(value) + if not rspamd_util.is_valid_utf8(folded) then + folded = rspamd_util.mime_header_encode(folded) end else - value = rspamd_util.mime_header_encode(value) + folded = rspamd_util.mime_header_encode(folded) end table.insert(add[hname], { order = (order or settings.default_headers_order or -1), - value = lua_util.fold_header(task, hname, value, stop_chars) + value = folded }) end -- 2.39.5