Mailing List Archive

Author: felicity
Date: Fri Dec 8 17:07:51 2006
New Revision: 484873

URL: http://svn.apache.org/viewvc?view=rev&rev=484873
Log:
deal with multiple DK/DKIM headers if they exist

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?view=diff&rev=484873&r1=484872&r2=484873
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Fri Dec 8 17:07:51 2006
@@ -1748,12 +1748,11 @@
my %parsed = map { $_ => 'parsed' } $self->_get_parsed_uri_list();

# Look for the domain in DK/DKIM headers
- foreach my $dk ( $self->get('DomainKey-Signature'), $self->get('DKIM-Signature') ) {
- if ($dk =~ /\bd\s*=\s*([^;]+)/) {
- my $dom = $1;
- $dom =~ s/\s+//g;
- $parsed{$dom} = 'domainkeys';
- }
+ my $dk = join(" ", $self->get('DomainKey-Signature'), $self->get('DKIM-Signature'));
+ while ($dk =~ /\bd\s*=\s*([^;]+)/g) {
+ my $dom = $1;
+ $dom =~ s/\s+//g;
+ $parsed{$dom} = 'domainkeys';
}

# get URIs from HTML parsing