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/30 06:26:56 UTC
svn commit: r1845197 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Author: hege
Date: Tue Oct 30 06:26:56 2018
New Revision: 1845197
URL: http://svn.apache.org/viewvc?rev=1845197&view=rev
Log:
Small re fix, don't warn with sa-update lint
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1845197&r1=1845196&r2=1845197&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm Tue Oct 30 06:26:56 2018
@@ -50,9 +50,9 @@ sub new {
if ($self->{conf}->{valid_tlds} && %{$self->{conf}->{valid_tlds}}) {
# International domain names are already in ASCII-compatible encoding (ACE)
my $tlds =
- '(?<![a-zA-Z0-9-])'. # make sure tld starts at boundary
+ '(?<![a-zA-Z0-9-])(?:'. # make sure tld starts at boundary
join('|', keys %{$self->{conf}->{valid_tlds}}).
- '(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
+ ')(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
# Perl 5.10+ trie optimizes lists, no need for fancy regex optimizing
if (eval { $self->{valid_tlds_re} = qr/$tlds/i; 1; }) {
dbg("config: registryboundaries: %d tlds loaded",
@@ -65,7 +65,8 @@ sub new {
else {
# Failsafe in case no tlds defined, we don't want this to match everything..
$self->{valid_tlds_re} = qr/no_tlds_defined/;
- warn "config: registryboundaries: no tlds defined, need to run sa-update\n";
+ warn "config: registryboundaries: no tlds defined, need to run sa-update\n"
+ if !$self->{main}->{ignore_site_cf_files};
}
$self;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1845197&r1=1845196&r2=1845197&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/RegistryBoundaries.pm Tue Oct 30 06:26:56 2018
@@ -54,9 +54,9 @@ sub new {
if ($self->{conf}->{valid_tlds} && %{$self->{conf}->{valid_tlds}}) {
# International domain names are already in ASCII-compatible encoding (ACE)
my $tlds =
- '(?<![a-zA-Z0-9-])'. # make sure tld starts at boundary
+ '(?<![a-zA-Z0-9-])(?:'. # make sure tld starts at boundary
join('|', keys %{$self->{conf}->{valid_tlds}}).
- '(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
+ ')(?!(?:[a-zA-Z0-9-]|\.[a-zA-Z0-9]))'; # make sure it ends
# Perl 5.10+ trie optimizes lists, no need for fancy regex optimizing
if (eval { $self->{valid_tlds_re} = qr/$tlds/i; 1; }) {
dbg("config: registryboundaries: %d tlds loaded",
@@ -69,7 +69,8 @@ sub new {
else {
# Failsafe in case no tlds defined, we don't want this to match everything..
$self->{valid_tlds_re} = qr/no_tlds_defined/;
- warn "config: registryboundaries: no tlds defined, need to run sa-update\n";
+ warn "config: registryboundaries: no tlds defined, need to run sa-update\n"
+ if !$self->{main}->{ignore_site_cf_files};
}
$self;