From: Eric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Date: Sat, 3 Mar 2018 07:31:54 +0000 (+0000)
Subject: v2writable: generated Message-ID goes first
X-Git-Tag: v1.1.0-pre1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d95eee4a10bdb9d30a6aeb93b475250e02109506;p=thirdparty%2Fpublic-inbox.git

v2writable: generated Message-ID goes first

This is to make SearchMsg behave more sanely under NNTP.
---

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6d7382780..c73d859b8 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -142,7 +142,7 @@ sub num_for_harder {
 		}
 	}
 	my @cur = $hdr->header_raw('Message-Id');
-	$hdr->header_set('Message-Id', @cur, "<$mid>");
+	$hdr->header_set('Message-Id', "<$mid>", @cur);
 	$num;
 }
 
diff --git a/t/v2writable.t b/t/v2writable.t
index 44191c136..f95b2e741 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -53,8 +53,8 @@ ok($im->add($mime), 'ordinary message added');
 	ok($im->add($mime), 'reused mid ok');
 	like(join(' ', @warn), qr/reused/, 'warned about reused MID');
 	my @mids = $mime->header_obj->header_raw('Message-Id');
-	is($mids[0], '<a-mid@b>', 'original mid not changed');
-	like($mids[1], qr/\A<\w+\@localhost>\z/, 'new MID added');
+	is($mids[1], '<a-mid@b>', 'original mid not changed');
+	like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
 	is(scalar(@mids), 2, 'only one new MID added');
 
 	@warn = ();
@@ -68,8 +68,8 @@ ok($im->add($mime), 'ordinary message added');
 	ok($im->add($mime), 'random MID made');
 	like(join(' ', @warn), qr/using random/, 'warned about using random');
 	@mids = $mime->header_obj->header_raw('Message-Id');
-	is($mids[0], '<a-mid@b>', 'original mid not changed');
-	like($mids[1], qr/\A<\w+\@localhost>\z/, 'new MID added');
+	is($mids[1], '<a-mid@b>', 'original mid not changed');
+	like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
 	is(scalar(@mids), 2, 'only one new MID added');
 
 	@warn = ();