You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2010/02/17 00:06:53 UTC
svn commit: r910749 - in /spamassassin/trunk: rules/20_head_tests.cf
rules/50_scores.cf rulesrc/sandbox/khopesh/20_bug_6271.cf
Author: khopesh
Date: Tue Feb 16 23:06:53 2010
New Revision: 910749
URL: http://svn.apache.org/viewvc?rev=910749&view=rev
Log:
bug 6271 - zero-out DATE_IN_FUTURE_96_XX in favor of splitting it into DATE_IN_FUTURE_96_Q and DATE_IN_FUTURE_Q_PLUS as a return to FH_DATE_PAST_20XX
Modified:
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6271.cf
Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=910749&r1=910748&r2=910749&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Tue Feb 16 23:06:53 2010
@@ -506,7 +506,8 @@
header DATE_IN_FUTURE_48_96 eval:check_for_shifted_date('48', '96')
describe DATE_IN_FUTURE_48_96 Date: is 48 to 96 hours after Received: date
-header DATE_IN_FUTURE_96_XX eval:check_for_shifted_date('96', 'undef')
+#header DATE_IN_FUTURE_96_XX eval:check_for_shifted_date('96', 'undef')
+meta DATE_IN_FUTURE_96_XX (0)
describe DATE_IN_FUTURE_96_XX Date: is 96 hours or more after Received: date
header UNRESOLVED_TEMPLATE eval:check_unresolved_template()
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=910749&r1=910748&r2=910749&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Feb 16 23:06:53 2010
@@ -797,7 +797,8 @@
score DATE_IN_FUTURE_12_24 2.603 2.489 3.199 3.199
score DATE_IN_FUTURE_24_48 2.598 1.248 0.001 2.048
score DATE_IN_FUTURE_48_96 2.384 0.813 1.078 2.181
-score DATE_IN_FUTURE_96_XX 2.614 3.028 2.851 3.087
+#score DATE_IN_FUTURE_96_XX 2.614 3.028 2.851 3.087
+score DATE_IN_FUTURE_96_XX 0
score DATE_IN_PAST_03_06 2.399 1.076 1.200 1.592
score DATE_IN_PAST_06_12 1.699 1.103 1.274 1.543
score DATE_IN_PAST_12_24 0.001 0.804 1.190 1.049
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6271.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6271.cf?rev=910749&r1=910748&r2=910749&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6271.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6271.cf Tue Feb 16 23:06:53 2010
@@ -38,11 +38,14 @@
# Expected stats: 0.1782/0.0029 Spam%/Ham% at 0.984 S/O
+# Actual: 0.1065/0.0029 Spam%/Ham% at 0.974 S/O @ 20100207
+# 0.0723/0.0033 spam/ham at 0.956 s/o @ 20100212
header DATE_IN_FUTURE_96_Q eval:check_for_shifted_date('96', '2920')
describe DATE_IN_FUTURE_96_Q Date: is 4 days to 4 months after Received: date
-tflags DATE_IN_FUTURE_96_Q nopublish # remove 96_XX before publishing this!
# Expected stats: 0.2469/0.0008 Spam%/Ham% at 0.997 S/O and a higher 'Rank'
+# Actual: 0.1515/0.0011 Spam%/Ham% at 0.993 S/O @ 20100207
+# 0.5497/0.0038 spam/ham at 0.993 s/o @ 20100212
header DATE_IN_FUTURE_Q_PLUS eval:check_for_shifted_date('2920', 'undef')
describe DATE_IN_FUTURE_Q_PLUS Date: is over 4 months after Received: date