You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2007/07/24 15:10:06 UTC
svn commit: r559039 - /spamassassin/rules/trunk/sandbox/sidney/70_other.cf
Author: sidney
Date: Tue Jul 24 06:10:03 2007
New Revision: 559039
URL: http://svn.apache.org/viewvc?view=rev&rev=559039
Log:
new tests to investigate bug 5571
Modified:
spamassassin/rules/trunk/sandbox/sidney/70_other.cf
Modified: spamassassin/rules/trunk/sandbox/sidney/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/sidney/70_other.cf?view=diff&rev=559039&r1=559038&r2=559039
==============================================================================
--- spamassassin/rules/trunk/sandbox/sidney/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/sidney/70_other.cf Tue Jul 24 06:10:03 2007
@@ -1,58 +1,7 @@
-# some tests to try to understand an FP I saw with OE and EXTRA_MPART_TYPE
+# test Outlook message ids to help understand bug 5571
-# OE with HTML
-meta T_SIDNEY_OE_HTML (__MIME_HTML && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# OE without HTML
-meta T_SIDNEY_OE_NHTML ((!__MIME_HTML) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# OE with EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_EMPT (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# OE without EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_NEMPT ((!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# OE with HTML and EXTRA_MPART_TYPE (should be same as above)
-meta T_SIDNEY_OE_HTML_EMPT (__MIME_HTML && (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-
-# OE without HTML and with EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_NHTML_EMPT ((!__MIME_HTML) && (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-
-# OE without HTML and without EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_NHTML_NMPT ((!__MIME_HTML) && (!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# OE with HTML and without EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_HTML_NMPT (__MIME_HTML && (!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE with HTML
-meta T_SIDNEY_NOE_HTML (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE without HTML
-meta T_SIDNEY_NOE_NHTML (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))
-
-# Not OE with EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_EMPT (EXTRA_MPART_TYPE && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE without EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_NEMPT ((!EXTRA_MPART_TYPE) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE with HTML with EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_HTML_EMPT (EXTRA_MPART_TYPE && (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-
-# Not OE without HTML and with EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_NHTML_EMPT (EXTRA_MPART_TYPE && (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE without HTML without EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_NHTML_NEMPT ((!EXTRA_MPART_TYPE) && (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-
-# Not OE with HTML without EXTRA_MPART_TYPE
-meta T_SIDNEY_NOE_HTML_NEMPT ((!EXTRA_MPART_TYPE) && (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-
-# EXTRA_MPART_TYPE that is not MULTIPART_RELATED
-meta T_SIDNEY_EMPT_NMPREL (EXTRA_MPART_TYPE && !__MULTIPART_RELATED)
-
-# OE EXTRA_MPART_TYPE that is not MULTIPART_RELATED
-meta T_SIDNEY_OE_EMPT_NMPREL (EXTRA_MPART_TYPE && !__MULTIPART_RELATED && __OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))
-
-# Not OE EXTRA_MPART_TYPE that is not MULTIPART_RELATED
-meta T_SIDNEY_NOE_EMPT_NMPREL (EXTRA_MPART_TYPE && !__MULTIPART_RELATED && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+header T_SIDNEY_OUTLOOK_MSGID_0 MESSAGEID =~ /^<[A-F\d]{20,31}\@\S+>$/m
+header T_SIDNEY_OUTLOOK_MSGID_1 MESSAGEID =~ /^<[A-F\d]{32,35}\@\S+>$/m
+meta T_SIDNEY_OUTLOOK_FORMAT_0 (__OUTLOOK_DOLLARS_MUA && T_SIDNEY_OUTLOOK_MSGID_0)
+meta T_SIDNEY_OUTLOOK_FORMAT_1 (__OUTLOOK_DOLLARS_MUA && T_SIDNEY_OUTLOOK_MSGID_1)
+meta T_SIDNEY_OUTLOOK_FORMAT_2 (__OUTLOOK_DOLLARS_MUA && __IMS_MSGID)