]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Update mail.ru Received header regexp 1438/head
authorAlexander Moisseev <moiseev@mezonplus.ru>
Mon, 20 Feb 2017 13:49:26 +0000 (16:49 +0300)
committerAlexander Moisseev <moiseev@mezonplus.ru>
Mon, 20 Feb 2017 13:49:26 +0000 (16:49 +0300)
as header format has been changed by mail.ru

rules/regexp/headers.lua

index 2aa7b139c0cbc98a3f0dcf15024a35ae579c9f60..30ccd5d0f2ffb1a03ce502297c7f3cacd6389d39 100644 (file)
@@ -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,