You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2008/09/11 18:24:03 UTC
svn commit: r694338 - /spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf
Author: mmartinec
Date: Thu Sep 11 09:24:00 2008
New Revision: 694338
URL: http://svn.apache.org/viewvc?rev=694338&view=rev
Log:
Updated regexp, fixed description.
Modified:
spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf
Modified: spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf?rev=694338&r1=694337&r2=694338&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/20_misc.cf Thu Sep 11 09:24:00 2008
@@ -25,13 +25,13 @@
header FROM_UC_UNBAL From:raw =~ /^\s*[A-Z][A-Z0-9 \t]*<[A-Z0-9]+\@[^>]*$/m
describe FROM_UC_UNBAL All-upercase name in From and unbalanced <>
-header FROM_WSP_TRAIL From:raw =~ / < .* \@ [^\@]* \s > /xm
+header FROM_WSP_TRAIL From:raw =~ /< [^>]* \s > [^<>]* \z/xm
describe FROM_WSP_TRAIL Trailing whitespace before '>' in From header field
-header FROM_WSP_LEAD From:raw =~ / < \s .* \@ [^\@]* > /xm
-describe FROM_WSP_TRAIL Leading whitespace after '<' in From header field
+header FROM_WSP_LEAD From:raw =~ /< \s+ [^>\s] [^>]* > [^<>]* \z/xm
+describe FROM_WSP_LEAD Leading whitespace after '<' in From header field
-header MSGID_WSP_TRAIL Message-ID:raw =~ / < .* \@ [^\@]* \s > /xm
+header MSGID_WSP_TRAIL Message-ID:raw =~ /< [^>]* \s > [^<>]* \z/xm
describe MSGID_WSP_TRAIL Trailing whitespace before '>' in Message-ID header
@@ -43,3 +43,6 @@
#score FROM_UNBAL1 3
#score FROM_UNBAL2 3
#score FROM_UC_UNBAL 6
+#score FROM_WSP_TRAIL 2
+#score FROM_WSP_LEAD 2
+#score MSGID_WSP_TRAIL 2