[svn:qpsmtpd] r623 - in branches/0.3x: . plugins/queue

[email protected] Mon, 27 Feb 2006 23:04:52 -0800 (PST)
Newsgroups perl.cvs.qpsmtpd
Message-ID <[email protected]>
Author: aqua
Date: Mon Feb 27 23:04:52 2006
New Revision: 623

Modified:
   branches/0.3x/Changes
   branches/0.3x/plugins/queue/exim-bsmtp

Log:
Oops.  Don't emit a newline between header and body when queueing over bsmtp,
because the body itself already contains one.


Modified: branches/0.3x/Changes
==============================================================================
--- branches/0.3x/Changes	(original)
+++ branches/0.3x/Changes	Mon Feb 27 23:04:52 2006
@@ -1,5 +1,8 @@
 0.33
 
+   Fix a spurious newline at the start of messages queued via exim (Devin
+   Carraway)
+
    Make the clamdscan plugin temporarily deny mail if if can't talk to clamd
    (Filippo Carletti)
 

Modified: branches/0.3x/plugins/queue/exim-bsmtp
==============================================================================
--- branches/0.3x/plugins/queue/exim-bsmtp	(original)
+++ branches/0.3x/plugins/queue/exim-bsmtp	Mon Feb 27 23:04:52 2006
@@ -90,8 +90,7 @@
                "MAIL FROM:<", ($txn->sender->address || ''), ">\n";
     print $tmp "RCPT TO:<", ($_->address || ''), ">\n"
       for $txn->recipients;
-    print $tmp "DATA\n",
-               $txn->header->as_string, "\n";
+    print $tmp "DATA\n", $txn->header->as_string;
     $txn->body_resetpos;
     while (my $line = $txn->body_getline) {
       $line =~ s/^\./../;