svn commit: r170697 - /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

[jm...@apache.org]

Author: jm
Date: Tue May 17 18:55:23 2005
New Revision: 170697

URL: http://svn.apache.org/viewcvs?rev=170697&view=rev
Log:
bug 4261: absolutely 0 difference in hits for me on recent ham/spam, so in it goes

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=170697&r1=170696&r2=170697&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Tue May 17 18:55:23 2005
@@ -646,14 +646,10 @@
 
     # ensure we have other indicative headers too
     if ($dlto =~ /^mailing list \S+\@\S+/ &&
-      	$rcvd =~ /qmail \d+ invoked by .{3,20}\); \d+ ... \d+/)
+        $rcvd =~ /qmail \d+ invoked (?:from network|by .{3,20})\); \d+ ... \d+/)
     {
       return 1;
     }
-    # jm: this line *was* included:
-    #   $rcvd =~ /qmail \d+ invoked from network\); \d+ ... \d+/ &&
-    # but I've found FPs where it did not appear in the mail; it's
-    # not required.
   }
 
   if ($self->get("Received") !~ /\S/) {