svn commit: r471794 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf

[jm...@apache.org]

Author: jm
Date: Mon Nov  6 08:55:31 2006
New Revision: 471794

URL: http://svn.apache.org/viewvc?view=rev&rev=471794
Log:
some more attempted FP elimination

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=471794&r1=471793&r2=471794
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Mon Nov  6 08:55:31 2006
@@ -140,10 +140,13 @@
 
 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 __CT_7BIT        Content-Transfer-Encoding =~ /7bit/
+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_2     (HDR_ORDER_FTSDMCXXXX && !__CT_7BIT)
+meta HDR_ORDER_FTSDMCXXXX_3     (HDR_ORDER_FTSDMCXXXX && !__HAS_CT && __HAS_PART_CT_QP)
 
 meta SHORT_HELO_AND_INLINE_IMAGE     (__HELO_NO_DOMAIN && __PART_STOCK_IMG)