You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/06/03 05:46:33 UTC
svn commit: r1901581 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin: Phishing.pm Pyzor.pm URIDetail.pm
Author: hege
Date: Fri Jun 3 05:46:32 2022
New Revision: 1901581
URL: http://svn.apache.org/viewvc?rev=1901581&view=rev
Log:
Minor got_hit/rule_ready cleanups (Bug 7999)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm?rev=1901581&r1=1901580&r2=1901581&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm Fri Jun 3 05:46:32 2022
@@ -313,7 +313,6 @@ sub check_phishing {
$feedname = $self->{PHISHING}->{$stripped_cluri}->{phishinfo}->{$domain}[0];
dbg("HIT! $domain [$stripped_cluri] found in $feedname feed");
$pms->test_log("$feedname ($domain)", $rulename);
- $pms->got_hit($rulename, "", ruletype => 'eval');
return 1;
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1901581&r1=1901580&r2=1901581&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Fri Jun 3 05:46:32 2022
@@ -324,7 +324,8 @@ sub check_pyzor {
if (!$self->{main}->{conf}->{pyzor_fork}) {
my @results = $self->pyzor_lookup($pms);
- return $self->_check_result($pms, \@results);
+ $self->_check_result($pms, \@results);
+ return 0; # _check_result calls got_hit()
}
## forking method
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm?rev=1901581&r1=1901580&r2=1901581&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm Fri Jun 3 05:46:32 2022
@@ -239,12 +239,10 @@ sub check_uri_detail {
dbg("uri: criteria for $test met");
}
- $permsg->got_hit($test);
-
# reset hash
keys %uri_detail;
- return 0;
+ return 1;
}
return 0;