You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2011/05/11 06:39:46 UTC

svn commit: r1101745 - in /spamassassin/trunk: rules/20_head_tests.cf rulesrc/sandbox/hege/20_bug6346.cf

Author: hege
Date: Wed May 11 04:39:46 2011
New Revision: 1101745

URL: http://svn.apache.org/viewvc?rev=1101745&view=rev
Log:
Bug 6346: MISSING_MIMEOLE FPs with Office 12/14

Modified:
    spamassassin/trunk/rules/20_head_tests.cf
    spamassassin/trunk/rulesrc/sandbox/hege/20_bug6346.cf

Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=1101745&r1=1101744&r2=1101745&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Wed May 11 04:39:46 2011
@@ -299,7 +299,9 @@ describe X_IP			Message has X-IP header
 header   __HAS_MIMEOLE          exists:X-MimeOLE
 header   __HAS_MSMAIL_PRI       exists:X-MSMail-Priority
 header   __HAS_SQUIRRELMAIL_IN_MAILER	X-Mailer =~ /SquirrelMail\b/
-meta     MISSING_MIMEOLE	(__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER)
+# Bug 6346
+header   __HAS_OFFICE1214_IN_MAILER	X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[24]\.0/
+meta     MISSING_MIMEOLE	(__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER && !__HAS_OFFICE1214_IN_MAILER)
 describe MISSING_MIMEOLE	Message has X-MSMail-Priority, but no X-MimeOLE
 
 header __HAS_X_MAILER		exists:X-Mailer

Modified: spamassassin/trunk/rulesrc/sandbox/hege/20_bug6346.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hege/20_bug6346.cf?rev=1101745&r1=1101744&r2=1101745&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hege/20_bug6346.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/hege/20_bug6346.cf Wed May 11 04:39:46 2011
@@ -1,2 +1,2 @@
-header   __T_BUG6346_OFFICE1214     X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[24]\.0/
-meta     T_BUG6346_MISSING_MIMEOLE  MISSING_MIMEOLE && !__T_BUG6346_OFFICE1214
+#header   __T_BUG6346_OFFICE1214     X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[24]\.0/
+#meta     T_BUG6346_MISSING_MIMEOLE  MISSING_MIMEOLE && !__T_BUG6346_OFFICE1214