From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: 
X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00
 shortcircuit=no autolearn=unavailable version=3.3.2
X-Original-To: meta@public-inbox.org
Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net
 (Postfix) with ESMTP id 1FB721F42B for <meta@public-inbox.org>; Tue, 22 Sep
 2015 10:09:52 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/7] nntp: ensure body lines end with CRLF
Date: Tue, 22 Sep 2015 10:09:44 +0000
Message-Id: <20150922100948.8160-4-e@80x24.org>
In-Reply-To: <20150922100948.8160-1-e@80x24.org>
References: <20150922100948.8160-1-e@80x24.org>
List-Id: <meta@public-inbox.org>

It's common for mail bodies to end with LF-only, so end them with
CRLF to avoid triggering errors in clients.
---
 lib/PublicInbox/NNTP.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index bc8d6ed..71b774d 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;
 	'.'
 }
 
-- 
EW