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/07 18:57:09 UTC
svn commit: r472181 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf
Author: jm
Date: Tue Nov 7 09:57:09 2006
New Revision: 472181
URL: http://svn.apache.org/viewvc?view=rev&rev=472181
Log:
urgh, tricky to get FPs down on these
Modified:
spamassassin/rules/trunk/sandbox/jm/20_basic.cf
Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=472181&r1=472180&r2=472181
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Tue Nov 7 09:57:09 2006
@@ -138,15 +138,11 @@
# this is a bit tricky, I think some Outlooks will produce it
header MID_START_001C Message-ID =~ /^<000001c/
-header HDR_ORDER_MFTSMX ALL =~ /\nMessage-ID: <\S+@\S+>\nFrom: \"[^\"]+\" <\S+>\nTo: <\S+>\nSubject [^\n]+\nDate: [^\n]+\nMIME-Version: 1.0\nX-Mailer: /s
-header HDR_ORDER_FTSDMCXXXX ALL =~ /\nFrom: .{1,80}?\nTo: .{1,80}?\nSubject: .{1,200}?\nDate: .{1,40}?\nMIME-Version: .{1,40}?\nContent-Type: .{1,80}?\nX-Priority: .{1,40}?\nX-MSMail-Priority: .{1,40}?\nX-Mailer: .{1,40}?\nX-MimeOLE:/s
-header __HAS_CT Content-Transfer-Encoding =~ /./
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-mimeheader __HAS_PART_CT_QP Content-Transfer-Encoding =~ /quoted-printable/
-endif
-
-# this excludes a couple of FPs
-meta HDR_ORDER_FTSDMCXXXX_3 (HDR_ORDER_FTSDMCXXXX && !__HAS_CT && __HAS_PART_CT_QP)
+header __HDR_ORDER_FTSDMCXXXX ALL =~ /\nFrom: .{1,80}?\nTo: .{1,80}?\nSubject: .{1,200}?\nDate: .{1,40}?\nMIME-Version: .{1,40}?\nContent-Type: .{1,80}?\nX-Priority: .{1,40}?\nX-MSMail-Priority: .{1,40}?\nX-Mailer: .{1,40}?\nX-MimeOLE:/s
+meta HDR_ORDER_FTSDMCXX (__HDR_ORDER_FTSDMCXXXX && !__MIME_ATTACHMENT)
+meta HDR_ORDER_FTSDMCXX2 (__HDR_ORDER_FTSDMCXXXX && __BAT_BOUNDARY)
+meta HDR_ORDER_FTSDMCXX3 (__HDR_ORDER_FTSDMCXXXX && MID_START_001C)
+# describe HDR_ORDER_FTSDMCXX Header order is similar to spam (FTSDMCXX variant)
meta SHORT_HELO_AND_INLINE_IMAGE (__HELO_NO_DOMAIN && __PART_STOCK_IMG)