You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/11/01 14:35:28 UTC

svn commit: r469901 - /spamassassin/trunk/rules/20_head_tests.cf

Author: jm
Date: Wed Nov  1 05:35:28 2006
New Revision: 469901

URL: http://svn.apache.org/viewvc?view=rev&rev=469901
Log:
bug 4342: fix hotmail.com FPs on MSGID_FROM_MTA_HEADER, thanks Bob Menschel

Modified:
    spamassassin/trunk/rules/20_head_tests.cf

Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?view=diff&rev=469901&r1=469900&r2=469901
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Wed Nov  1 05:35:28 2006
@@ -137,7 +137,11 @@
 
 header __MSGID_BEFORE_RECEIVED	ALL =~ /\nMessage-Id:.*\nReceived:/si
 header __MSGID_BEFORE_OKAY	Message-Id =~ /\@[a-z0-9.-]+\.(?:yahoo|wanadoo)(?:\.[a-z]{2,3}){1,2}>/
-meta MSGID_FROM_MTA_HEADER	(__MSGID_BEFORE_RECEIVED && !__MSGID_BEFORE_OKAY)
+
+# bug 4342: thanks Bob
+header   __FROM_HOTMAIL_COM     From =~ /\@hotmail\.com\b/i
+
+meta MSGID_FROM_MTA_HEADER	(__MSGID_BEFORE_RECEIVED && !__MSGID_BEFORE_OKAY && !__FROM_HOTMAIL_COM)
 describe MSGID_FROM_MTA_HEADER	Message-Id was added by a relay
 
 header MSGID_FROM_MTA_HOTMAIL	Message-Id =~ /<MC\d{1,2}-F{1,2}\w{21,22}\@\S*hotmail\.com>/