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 2018/10/09 13:34:58 UTC
svn commit: r1843268 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Author: hege
Date: Tue Oct 9 13:34:57 2018
New Revision: 1843268
URL: http://svn.apache.org/viewvc?rev=1843268&view=rev
Log:
No need to check for time_method
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1843268&r1=1843267&r2=1843268&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Tue Oct 9 13:34:57 2018
@@ -668,8 +668,7 @@ sub _dkim_load_modules {
if (!$self->{tried_loading}) {
$self->{service_available} = 0;
- my $timemethod = $self->{main}->UNIVERSAL::can("time_method") &&
- $self->{main}->time_method("dkim_load_modules");
+ my $timemethod = $self->{main}->time_method("dkim_load_modules");
my $eval_stat;
eval {
# Have to do this so that RPM doesn't find these as required perl modules.
@@ -805,8 +804,7 @@ sub _check_dkim_signature {
# Mail::DKIM module not available
} else {
# signature objects not provided by the caller, must verify for ourselves
- my $timemethod = $self->{main}->UNIVERSAL::can("time_method") &&
- $self->{main}->time_method("check_dkim_signature");
+ my $timemethod = $self->{main}->time_method("check_dkim_signature");
if (Mail::DKIM::Verifier->VERSION >= 0.40) {
my $edns = $conf->{dns_options}->{edns};
if ($edns && $edns >= 1024) {
@@ -1063,8 +1061,7 @@ sub _check_dkim_adsp {
dbg("dkim: adsp not retrieved, module Mail::DKIM not available");
} else { # do the ADSP DNS lookup
- my $timemethod = $self->{main}->UNIVERSAL::can("time_method") &&
- $self->{main}->time_method("check_dkim_adsp");
+ my $timemethod = $self->{main}->time_method("check_dkim_adsp");
my $practices; # author domain signing practices object
my $timeout = $pms->{conf}->{dkim_timeout};