From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 11 Feb 2021 17:33:24 +0000 (+0000)
Subject: [Minor] Milter_headers: Support default headers order
X-Git-Tag: 3.0~684
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a6e45f6ee260958cc19c9a4c8860ae82d77a381;p=thirdparty%2Frspamd.git

[Minor] Milter_headers: Support default headers order

Issue: #3644
---

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index 305cc6411a..35b682a8ff 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -38,6 +38,7 @@ local settings = {
   skip_all = false,
   local_headers = {},
   authenticated_headers = {},
+  default_headers_order = nil, -- Insert at the end (set 1 to insert just after the first received)
   routines = {
     ['remove-headers'] = {
       headers = {},
@@ -219,8 +220,16 @@ local function milter_headers(task)
           }
         end
 
-        table.insert(add[hname],
-            lua_util.fold_header(task, hname, value, stop_chars))
+        if settings.default_headers_order then
+          table.insert(add[hname], {
+            order = settings.default_headers_order,
+            value = lua_util.fold_header(task, hname, value, stop_chars)
+          })
+        else
+          table.insert(add[hname],
+              lua_util.fold_header(task, hname, value, stop_chars))
+        end
+
       end
     end
   end