From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Tue, 20 Mar 2018 08:48:08 +0000 (+0300)
Subject: [Minor] Catch upstream `X-Spam` flag as well with `SPAM_FLAG` regexp
X-Git-Tag: 1.7.1~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2974e4ecd1e3731204819f9bd257a92bb3ac2969;p=thirdparty%2Frspamd.git

[Minor] Catch upstream `X-Spam` flag as well with `SPAM_FLAG` regexp
---

diff --git a/rules/regexp/upstream_spam_filters.lua b/rules/regexp/upstream_spam_filters.lua
index fbb41db5d6..dc0f14bcdc 100644
--- a/rules/regexp/upstream_spam_filters.lua
+++ b/rules/regexp/upstream_spam_filters.lua
@@ -41,7 +41,7 @@ reconf['AOL_SPAM'] = {
 }
 
 reconf['SPAM_FLAG'] = {
-    re = 'X-Spam-Flag=/^(?:yes|true)/Hi',
+    re = string.format('%s || %s', 'X-Spam-Flag=/^(?:yes|true)/Hi', 'X-Spam=/^yes$/Hi'),
     score = 5,
     description = "Message was already marked as spam",
     group = 'upstream_spam_filters'