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 2010/02/14 18:30:15 UTC

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

Author: jhardin
Date: Sun Feb 14 17:30:15 2010
New Revision: 910051

URL: http://svn.apache.org/viewvc?rev=910051&view=rev
Log:
Tweak FROM_URI - allow for spaces and restore .ORG TLD

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=910051&r1=910050&r2=910051&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Sun Feb 14 17:30:15 2010
@@ -239,7 +239,7 @@
 
 # a URI in the From comment text, to bypass URIBL checks
 # simplistic URI format for now
-header         FROM_URI       From =~ /[^\@]www\.[^\s"<\@]+\.(?:com|net|info|biz|\w\w)\b.*["<]/i
+header         FROM_URI       From =~ /[^\@]www[.\s][^\s"<\@]+[.\s](?:com|net|info|biz|org|\w\w)\b.*["<]/i
 
 # observed in spam feb 2010
 # Apparently-To per RFC2821 SHOULD NOT be used