You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2015/11/17 08:21:09 UTC

svn commit: r1714726 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf

Author: jhardin
Date: Tue Nov 17 07:21:09 2015
New Revision: 1714726

URL: http://svn.apache.org/viewvc?rev=1714726&view=rev
Log:
retune XPRIO FP avoidance, add test rule, minor cleanup

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf

Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1714726&r1=1714725&r2=1714726&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Tue Nov 17 07:21:09 2015
@@ -1466,16 +1466,20 @@ header      __FROM_LOWER       ALL =~ /f
 header      __TO___LOWER       ALL =~ /to:\s\S{5}/
 header      __DATE_LOWER       ALL =~ /date:\s\S{5}/
 
-header      __FH_HAS_XMSMAIL   exists:X-MSMail-Priority
 
 # duplicates __XPRIO
 #header      __FH_HAS_XPRIORITY exists:X-Priority
-meta        XPRIO              __XPRIO && !ALL_TRUSTED && !__PHPMAILER_MUA && !__BUGGED_IMG && !__HAS_ERRORS_TO && !__THREADED && !__VIA_ML && !__RCD_RDNS_MX_MESSY && !__HAS_THREAD_INDEX && !__RP_MATCHES_RCVD && !__HAS_X_REF && !__LCL__ENV_AND_HDR_FROM_MATCH 
+#meta        XPRIO              __XPRIO && !ALL_TRUSTED && !__PHPMAILER_MUA && !__BUGGED_IMG && !__HAS_ERRORS_TO && !__THREADED && !__VIA_ML && !__RCD_RDNS_MX_MESSY && !__HAS_THREAD_INDEX && !__RP_MATCHES_RCVD && !__HAS_X_REF && !__LCL__ENV_AND_HDR_FROM_MATCH 
+meta        XPRIO              __XPRIO && !ALL_TRUSTED && !__PHPMAILER_MUA && !__BUGGED_IMG && !__HAS_ERRORS_TO && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__RCD_RDNS_MAIL_MESSY 
 describe    XPRIO              Has X-Priority header
-score       XPRIO              1.000   # limit
+score       XPRIO              2.000	# limit
 
 # some no-ham combinations
 
+meta        XPRIO_SHORT_SUBJ   __XPRIO && __SUBJ_SHORT 
+describe    XPRIO_SHORT_SUBJ   Has X-Priority header + short subject
+score       XPRIO_SHORT_SUBJ   2.500	# limit
+
 meta        FROM_MISSP_XPRIO   __XPRIO && __FROM_MISSPACED 
 describe    FROM_MISSP_XPRIO   Misspaced FROM + X-Priority
 score       FROM_MISSP_XPRIO   2.500   # limit
@@ -2014,6 +2018,9 @@ meta       LIST_PARTIAL_SHORT_MSG
 describe   LIST_PARTIAL_SHORT_MSG       Incomplete mailing list headers + short message
 score      LIST_PARTIAL_SHORT_MSG       2.000	# limit
 
+# duplicates __HAS_MSMAIL_PRI
+#header      __FH_HAS_XMSMAIL   exists:X-MSMail-Priority
+
 meta       __BOGUS_MSM_HDRS             __HAS_MSMAIL_PRI && __MSOE_MID_WRONG_CASE && __HDR_ORDER_FTSDMCXXXX
 meta       BOGUS_MSM_HDRS               __BOGUS_MSM_HDRS
 describe   BOGUS_MSM_HDRS               Apparently bogus Microsoft email headers
@@ -2023,5 +2030,7 @@ tflags     BOGUS_MSM_HDRS
 meta       __BOGUS_MSM_PRIO             __HAS_MSMAIL_PRI && __HDR_ORDER_FTSDMCXXXX
 meta       __BOGUS_MSM_PRIO_MINFP       __BOGUS_MSM_PRIO && !__BOGUS_MSM_HDRS && !__MSGID_NOFQDN2 && !__ANY_OUTLOOK_MUA && !__RCD_RDNS_MAIL_MESSY
 
+meta       __MSM_PRIO_REPTO             __HAS_MSMAIL_PRI && __REPLYTO_EXISTS 
+