From: Eric Wong <e@80x24.org>
Date: Tue, 22 Sep 2015 10:09:44 +0000 (+0000)
Subject: nntp: ensure body lines end with CRLF
X-Git-Tag: v1.0.0~847
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d537f2e8eac6b25b45f1cbf4e6f85786356b32;p=thirdparty%2Fpublic-inbox.git

nntp: ensure body lines end with CRLF

It's common for mail bodies to end with LF-only, so end them with
CRLF to avoid triggering errors in clients.
---

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index bc8d6eda6..71b774d22 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -393,7 +393,9 @@ sub simple_body_write ($$) {
 	my $body = $s->body;
 	$s->body_set('');
 	$body =~ s/^\./../smg;
+	$body =~ s/(?<!\r)\n/\r\n/sg;
 	do_more($self, $body);
+	do_more($self, "\r\n") unless $body =~ /\r\n\z/s;
 	'.'
 }