From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Mon, 20 Feb 2017 13:49:26 +0000 (+0300)
Subject: [Minor]  Update mail.ru Received header regexp
X-Git-Tag: 1.5.0~73^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c38bd4bd87033558057b876d5fa9013a91c9248;p=rspamd.git

[Minor]  Update mail.ru Received header regexp

as header format has been changed by mail.ru
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 2aa7b139c..30ccd5d0f 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -567,7 +567,7 @@ reconf['FORGED_MUA_THEBAT_BOUN'] = {
 
 -- Detect Mail.Ru web-mail
 local xm_mail_ru_mailer_1_0 = 'X-Mailer=/^Mail\\.Ru Mailer 1\\.0$/H'
-local rcvd_e_mail_ru = 'Received=/^from \\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\] by e\\.mail\\.ru with HTTP;/mH'
+local rcvd_e_mail_ru = 'Received=/^(?:from \\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\] )?by e\\.mail\\.ru with HTTP;/mH'
 reconf['MAIL_RU_MAILER'] = {
   re = string.format('(%s) & (%s)', xm_mail_ru_mailer_1_0, rcvd_e_mail_ru),
   score = 0.0,