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/05 20:02:34 UTC
svn commit: r1842976 -
/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Author: hege
Date: Fri Oct 5 20:02:33 2018
New Revision: 1842976
URL: http://svn.apache.org/viewvc?rev=1842976&view=rev
Log:
Handle IPs properly
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=1842976&r1=1842975&r2=1842976&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm Fri Oct 5 20:02:33 2018
@@ -34,6 +34,9 @@ our @ISA = qw();
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util qw(idn_to_ascii);
+use Mail::SpamAssassin::Constants qw(:ip);
+
+my $IP_ADDRESS = IP_ADDRESS;
# called from SpamAssassin->init() to create $self->{util_rb}
sub new {
@@ -229,7 +232,7 @@ sub uri_to_domain {
my $host = $uri; # unstripped/full domain name
# keep IPs intact
- if ($uri !~ /^\d+\.\d+\.\d+\.\d+$/) {
+ if ($uri !~ /^$IP_ADDRESS$/) {
# get rid of hostname part of domain, understanding delegation
$uri = $self->trim_domain($uri);