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/07 05:45:47 UTC
svn commit: r1843043 -
/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Author: hege
Date: Sun Oct 7 05:45:47 2018
New Revision: 1843043
URL: http://svn.apache.org/viewvc?rev=1843043&view=rev
Log:
Micro-optimize if/elsif order
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1843043&r1=1843042&r2=1843043&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm Sun Oct 7 05:45:47 2018
@@ -109,16 +109,11 @@ sub split_domain {
my @hostname;
while (@domparts > 1) { # go until we find the TLD
- if (@domparts == 4) {
- if ($domparts[3] eq 'us' &&
- (($domparts[0] eq 'pvt' && $domparts[1] eq 'k12') ||
- ($domparts[0] =~ /^c[io]$/)))
- {
- # http://www.neustar.us/policies/docs/rfc_1480.txt
- # "Fire-Dept.CI.Los-Angeles.CA.US"
- # "<school-name>.PVT.K12.<state>.US"
- last if ($US_STATES{$domparts[2]});
- }
+ if (@domparts == 2) {
+ # co.uk, etc.
+ my $temp = join(".", @domparts);
+ # International domain names in ASCII-compatible encoding (ACE)
+ last if ($self->{conf}->{two_level_domains}{$temp});
}
elsif (@domparts == 3) {
# http://www.neustar.us/policies/docs/rfc_1480.txt
@@ -134,11 +129,16 @@ sub split_domain {
last if ($self->{conf}->{three_level_domains}{$temp});
}
}
- elsif (@domparts == 2) {
- # co.uk, etc.
- my $temp = join(".", @domparts);
- # International domain names in ASCII-compatible encoding (ACE)
- last if ($self->{conf}->{two_level_domains}{$temp});
+ elsif (@domparts == 4) {
+ if ($domparts[3] eq 'us' &&
+ (($domparts[0] eq 'pvt' && $domparts[1] eq 'k12') ||
+ ($domparts[0] =~ /^c[io]$/)))
+ {
+ # http://www.neustar.us/policies/docs/rfc_1480.txt
+ # "Fire-Dept.CI.Los-Angeles.CA.US"
+ # "<school-name>.PVT.K12.<state>.US"
+ last if ($US_STATES{$domparts[2]});
+ }
}
push(@hostname, shift @domparts);
}
@@ -174,7 +174,7 @@ sub trim_domain {
my $self = shift;
my $domain = shift;
- my ($host, $dom) = $self->split_domain($domain);
+ my (undef, $dom) = $self->split_domain($domain);
return $dom;
}