You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/07/30 15:03:57 UTC
svn commit: r560962 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
Author: jm
Date: Mon Jul 30 06:03:57 2007
New Revision: 560962
URL: http://svn.apache.org/viewvc?view=rev&rev=560962
Log:
bug 5519: zeroing an 'eval' rule's score did not stop it running. fix, thanks to Richard Birkett <richard+spamassassin at musicbox.net>
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?view=diff&rev=560962&r1=560961&r2=560962
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Mon Jul 30 06:03:57 2007
@@ -890,6 +890,7 @@
}
$evalstr .= '
+ if ($scoresptr->{q#'.$rulename.'#}) {
$rulename = q#'.$rulename.'#;
$self->{test_log_msgs} = ();
';
@@ -947,7 +948,7 @@
$self->got_hit($rulename, $prepend2desc, ruletype => "eval", value => $result);
'.$dbgstr.'
}
-
+ }
';
}
@@ -963,6 +964,7 @@
sub ${methodname} {
my (\$self, \@extraevalargs) = \@_;
+ my \$scoresptr = \$self->{conf}->{scores};
my \$prepend2desc = q#$prepend2desc#;
my \$rulename;
my \$result;