Return-Path: Delivered-To: apmail-spamassassin-commits-archive@www.apache.org Received: (qmail 13273 invoked from network); 13 Nov 2006 09:37:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Nov 2006 09:37:31 -0000 Received: (qmail 95893 invoked by uid 500); 13 Nov 2006 09:37:42 -0000 Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org Received: (qmail 95831 invoked by uid 500); 13 Nov 2006 09:37:42 -0000 Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "SpamAssassin Dev" List-Id: Delivered-To: mailing list commits@spamassassin.apache.org Received: (qmail 95820 invoked by uid 99); 13 Nov 2006 09:37:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2006 01:37:42 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2006 01:37:27 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2C9A11A984F; Mon, 13 Nov 2006 01:36:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r474216 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Date: Mon, 13 Nov 2006 09:36:54 -0000 To: commits@spamassassin.apache.org From: sidney@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061113093654.2C9A11A984F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sidney Date: Mon Nov 13 01:36:53 2006 New Revision: 474216 URL: http://svn.apache.org/viewvc?view=rev&rev=474216 Log: bug 5179: DKIM plugin was adding blank line after headers when they use DOS style newlines Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?view=diff&rev=474216&r1=474215&r2=474216 ============================================================================== --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Mon Nov 13 01:36:53 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");