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/21 09:18:35 UTC
svn commit: r1844472 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm
Plugin/DNSEval.pm
Author: hege
Date: Sun Oct 21 09:18:35 2018
New Revision: 1844472
URL: http://svn.apache.org/viewvc?rev=1844472&view=rev
Log:
Some minor optimizations
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1844472&r1=1844471&r2=1844472&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sun Oct 21 09:18:35 2018
@@ -5233,7 +5233,7 @@ sub maybe_header_only {
my($self,$rulename) = @_;
my $type = $self->{test_types}->{$rulename};
- if ($rulename =~ /AUTOLEARNTEST/i) {
+ if ($rulename =~ /^AUTOLEARNTEST/) {
dbg("config: auto-learn: $rulename - Test type is $self->{test_types}->{$rulename}.");
}
@@ -5243,9 +5243,7 @@ sub maybe_header_only {
return 1;
} elsif ($type == $TYPE_META_TESTS) {
- my $tflags = $self->{tflags}->{$rulename};
- $tflags ||= '';
- if ($tflags =~ m/\bnet\b/i) {
+ if (($self->{tflags}->{$rulename}||'') =~ /\bnet\b/) {
return 0;
} else {
return 1;
@@ -5259,7 +5257,7 @@ sub maybe_body_only {
my($self,$rulename) = @_;
my $type = $self->{test_types}->{$rulename};
- if ($rulename =~ /AUTOLEARNTEST/i) {
+ if ($rulename =~ /^AUTOLEARNTEST/) {
dbg("config: auto-learn: $rulename - Test type is $self->{test_types}->{$rulename}.");
}
@@ -5272,8 +5270,7 @@ sub maybe_body_only {
return 1;
} elsif ($type == $TYPE_META_TESTS) {
- my $tflags = $self->{tflags}->{$rulename}; $tflags ||= '';
- if ($tflags =~ m/\bnet\b/i) {
+ if (($self->{tflags}->{$rulename}||'') =~ /\bnet\b/) {
return 0;
} else {
return 1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm?rev=1844472&r1=1844471&r2=1844472&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm Sun Oct 21 09:18:35 2018
@@ -263,10 +263,8 @@ sub check_rbl_backend {
splice (@ips, $checklast); # remove all others
}
- my $tflags = $pms->{conf}->{tflags}->{$rule};
-
# Trusted relays should only be checked against nice rules (dnswls)
- if (defined $tflags && $tflags !~ /\bnice\b/) {
+ if (($pms->{conf}->{tflags}->{$rule}||'') !~ /\bnice\b/) {
# remove trusted hosts from beginning
while (@ips && $trusted->contains_ip($ips[0])) { shift @ips }
}