svn commit: rev 55187 - spamassassin/trunk/masses

[qu...@apache.org]

Author: quinlan
Date: Wed Oct 20 17:14:38 2004
New Revision: 55187

Modified:
   spamassassin/trunk/masses/mass-check
Log:
minor optimization: avoid reparsing spams that are marked up with
"report_safe 0"


Modified: spamassassin/trunk/masses/mass-check
==============================================================================
--- spamassassin/trunk/masses/mass-check	(original)
+++ spamassassin/trunk/masses/mass-check	Wed Oct 20 17:14:38 2004
@@ -272,8 +272,8 @@
   my $ma = $spamtest->parse($dataref, 1);
 
   # remove SpamAssassin markup, if present and the mail was spam
-  my $stat = $ma->get_header("X-Spam-Status");
-  if ($stat && $stat =~ /^Yes,/) {
+  my $header = $ma->get_header("Received");
+  if ($header && $header =~ /\bwith SpamAssassin\b/) {
     if (!$opt_deencap || message_should_be_deencapped($ma)) {
       my $new_ma = $spamtest->parse($spamtest->remove_spamassassin_markup($ma), 1);
       $ma->finish();