user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
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	[thread overview]
Message-ID: <20150922100948.8160-4-e@80x24.org> (raw)
In-Reply-To: <20150922100948.8160-1-e@80x24.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


  parent reply	other threads:[~2015-09-22 10:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-22 10:09 [PATCH 0/7] nntp: another round of updates Eric Wong
2015-09-22 10:09 ` [PATCH 1/7] t/nntpd.t: fix fcntl test to ensure no failures Eric Wong
2015-09-22 10:09 ` [PATCH 2/7] nntp: support YYYYMMDD dates for commands Eric Wong
2015-09-22 10:09 ` Eric Wong [this message]
2015-09-22 10:09 ` [PATCH 4/7] nntp: avoid setting Bytes and Lines headers Eric Wong
2015-09-22 10:09 ` [PATCH 5/7] nntp: implement OVER from RFC 3977 Eric Wong
2015-09-22 10:09 ` [PATCH 6/7] nntp: XHDR fixes for Message-ID lookups Eric Wong
2015-09-22 10:09 ` [PATCH 7/7] nntp: XHDR lookups by Message-ID may cross groups Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150922100948.8160-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).