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 2011/07/25 07:01:01 UTC

svn commit: r1150548 - in /spamassassin/trunk/rulesrc/sandbox: jhardin/20_misc_testing.cf khopesh/20_khop_experimental.cf

Author: jhardin
Date: Mon Jul 25 05:01:00 2011
New Revision: 1150548

URL: http://svn.apache.org/viewvc?rev=1150548&view=rev
Log:
More FP avoidance (khopesh SINGLE_HEADER_1K)

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.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=1150548&r1=1150547&r2=1150548&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Mon Jul 25 05:01:00 2011
@@ -645,7 +645,7 @@ describe    CN_B2B_SPAMMER         Chine
 uri         __UPPERCASE_URI        /^[^:A-Z]+[A-Z]/
 
 # __ version of khopesh SINGLE_HEADER_1K, for use in metas
-header      __SINGLE_HEADER_1K     ALL:raw =~ /(?-xim:(?=(?!X-Spam|X-MailScan)(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){1024,2047}.(?:\n\S|$)))/s 
+#header      __SINGLE_HEADER_1K     ALL:raw =~ /(?-xim:(?=(?!X-Spam|X-MailScan)(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){1024,2047}.(?:\n\S|$)))/s 
 
 # __ version of mmartinec RP_MATCHES_RCVD, for use in metas
 

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf?rev=1150548&r1=1150547&r2=1150548&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf Mon Jul 25 05:01:00 2011
@@ -240,7 +240,9 @@ describe LONG_HEADER_LINE_320	A header l
 describe LONG_HEADER_LINE_400	A header line contains 400-499 characters
 describe LONG_HEADER_LINE_500	A header line contains 500+ characters
 
-header   SINGLE_HEADER_1K	ALL:raw =~ /(?-xim:(?=(?!X-Spam|X-MailScan)(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){1024,2047}.(?:\n\S|$)))/s
+header   __SINGLE_HEADER_1K	ALL:raw =~ /(?-xim:(?=(?!X-Spam|X-MailScan)(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){1024,2047}.(?:\n\S|$)))/s
+meta     SINGLE_HEADER_1K	__SINGLE_HEADER_1K && !__VIA_ML && !__DOS_HAS_LIST_ID && !__THREADED
+
 header   SINGLE_HEADER_2K	ALL:raw =~ /(?-xim:(?=(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){2048,3071}.(?:\n\S|$)))/s
 header   SINGLE_HEADER_3K	ALL:raw =~ /(?-xim:(?=(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){3072,4095}.(?:\n\S|$)))/s
 header   SINGLE_HEADER_4K	ALL:raw =~ /(?-xim:(?=(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){4096,5119}.(?:\n\S|$)))/s