Mailing List Archive

Author: sidney
Date: Fri Dec 8 13:26:30 2006
New Revision: 484786

URL: http://svn.apache.org/viewvc?view=rev&rev=484786
Log:
Bug 5179: fix handling of newline endings that could break DKIM

Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm?view=diff&rev=484786&r1=484785&r2=484786
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DKIM.pm Fri Dec 8 13:26:30 2006
@@ -256,8 +256,8 @@
}

# headers, line-by-line with \r\n endings, as per Mail::DKIM API
- foreach my $line (split(/\n/s, $header)) {
- $line =~ s/\r?$/\r\n/s; # ensure \r\n ending
+ foreach my $line (split(/\r?\n/s, $header)) { # split lines, deleting endings and final empty line
+ $line =~ s/$/\r\n/s; # add back a standard \r\n ending
$message->PRINT($line);
}
$message->PRINT("\r\n");