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/03 14:40:39 UTC
svn commit: r1864340 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Author: hege
Date: Sat Aug 3 14:40:38 2019
New Revision: 1864340
URL: http://svn.apache.org/viewvc?rev=1864340&view=rev
Log:
Fix _URIDOMAINS_ duplicates (Bug 6966)
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1864340&r1=1864339&r2=1864340&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Sat Aug 3 14:40:38 2019
@@ -487,10 +487,10 @@ sub parsed_metadata {
}
}
- my @hnames = keys %hostlist;
+ my @hnames = sort keys %hostlist;
$pms->set_tag('URIHOSTS',
@hnames == 1 ? $hnames[0] : \@hnames) if @hnames;
- my @dnames = values %hostlist;
+ my @dnames = do { my %seen; grep { !$seen{$_}++ } sort values %hostlist };
$pms->set_tag('URIDOMAINS',
@dnames == 1 ? $dnames[0] : \@dnames) if @dnames;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1864340&r1=1864339&r2=1864340&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Sat Aug 3 14:40:38 2019
@@ -480,10 +480,10 @@ sub check_dnsbl {
}
}
- my @hnames = keys %hostlist;
+ my @hnames = sort keys %hostlist;
$pms->set_tag('URIHOSTS',
@hnames == 1 ? $hnames[0] : \@hnames) if @hnames;
- my @dnames = values %hostlist;
+ my @dnames = do { my %seen; grep { !$seen{$_}++ } sort values %hostlist };
$pms->set_tag('URIDOMAINS',
@dnames == 1 ? $dnames[0] : \@dnames) if @dnames;