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 2019/08/19 04:19:58 UTC
svn commit: r1865409 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
branches/3.4/lib/Mail/SpamAssassin/Util.pm
trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
trunk/lib/Mail/SpamAssassin/Util.pm
Author: hege
Date: Mon Aug 19 04:19:58 2019
New Revision: 1865409
URL: http://svn.apache.org/viewvc?rev=1865409&view=rev
Log:
DNS name max length is actually 253 chars. Quote % for uniformity.
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1865409&r1=1865408&r2=1865409&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Aug 19 04:19:58 2019
@@ -2359,7 +2359,7 @@ sub _process_text_uri_list {
$uri = Mail::SpamAssassin::Util::url_encode($uri) if $uri =~ /\%[0-9a-f]{2}/i;
# Skip unless @ found after decoding, then check tld is valid
next unless $uri =~ /\@([^?&>]*)/;
- my $host = $1; $host =~ s/(?:%20)+$//; # strip trailing %20 from host
+ my $host = $1; $host =~ s/(?:\%20)+$//; # strip trailing %20 from host
next unless $self->{main}->{registryboundaries}->is_domain_valid($1);
}
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1865409&r1=1865408&r2=1865409&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Mon Aug 19 04:19:58 2019
@@ -353,8 +353,8 @@ sub is_fqdn_valid {
# remove trailing dots
$host =~ s/\.+\z//;
- # max total length 255
- return if length($host) > 255;
+ # max total length 253
+ return if length($host) > 253;
# validate dot separated components/labels
my @labels = split(/\./, lc $host);
@@ -1342,7 +1342,7 @@ sub uri_list_canonicalize {
}
# Address must be trimmed of %20
if ($nuri =~ tr/%20// &&
- $nuri =~ /^(?:mailto:)?(?:%20)*([^\@]+\@[^?&%]+)/) {
+ $nuri =~ /^(?:mailto:)?(?:\%20)*([^\@]+\@[^?&%]+)/) {
push @nuris, "mailto:$1";
}
# mailto:"Foo%20Bar"%20<fo...@example.com>
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1865409&r1=1865408&r2=1865409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Aug 19 04:19:58 2019
@@ -2491,7 +2491,7 @@ sub _process_text_uri_list {
$uri = Mail::SpamAssassin::Util::url_encode($uri) if $uri =~ /\%[0-9a-f]{2}/i;
# Skip unless @ found after decoding, then check tld is valid
next unless $uri =~ /\@([^?&>]*)/;
- my $host = $1; $host =~ s/(?:%20)+$//; # strip trailing %20 from host
+ my $host = $1; $host =~ s/(?:\%20)+$//; # strip trailing %20 from host
next unless $self->{main}->{registryboundaries}->is_domain_valid($1);
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1865409&r1=1865408&r2=1865409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Mon Aug 19 04:19:58 2019
@@ -396,8 +396,8 @@ sub is_fqdn_valid {
# remove trailing dots
$host =~ s/\.+\z//;
- # max total length 255
- return if length($host) > 255;
+ # max total length 253
+ return if length($host) > 253;
# validate dot separated components/labels
my @labels = split(/\./, $host);
@@ -1504,7 +1504,7 @@ sub uri_list_canonicalize {
}
# Address must be trimmed of %20
if ($nuri =~ tr/%20// &&
- $nuri =~ /^(?:mailto:)?(?:%20)*([^\@]+\@[^?&%]+)/) {
+ $nuri =~ /^(?:mailto:)?(?:\%20)*([^\@]+\@[^?&%]+)/) {
push @nuris, "mailto:$1";
}
# mailto:"Foo%20Bar"%20<fo...@example.com>