X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=2f821fa6b9b51902ddc221c9ca3f225d06e708af;hb=bf14a3670da7235806740aa55bd7a7248327abf7;hp=102ef42cf4455d8e4035b288172f19d693f85901;hpb=31f9b61a318f4daf8a6208ed4f6bc60aa355faa9;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 102ef42c..2f821fa6 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -415,10 +415,6 @@ sub set_nntp_headers ($$) {
 	my ($hdr, $smsg) = @_;
 	my ($mid) = $smsg->{mid};
 
-	# why? leafnode requires a Path: header for some inexplicable
-	# reason.  We'll fake the shortest one possible.
-	$hdr->header_set('Path', 'y');
-
 	# leafnode (and maybe other NNTP clients) have trouble dealing
 	# with v2 messages which have multiple Message-IDs (either due
 	# to our own content-based dedupe or buggy git-send-email versions).
@@ -432,12 +428,21 @@ sub set_nntp_headers ($$) {
 		$hdr->header_set('X-Alt-Message-ID', @alt);
 	}
 
-	# clobber some
+	# clobber some existing headers
 	my $ibx = $smsg->{-ibx};
 	my $xref = xref($smsg->{nntp}, $ibx, $smsg->{num}, $mid);
 	$hdr->header_set('Xref', $xref);
-	$xref =~ s/:[0-9]+//g;
-	$hdr->header_set('Newsgroups', (split(/ /, $xref, 2))[1]);
+
+	# RFC 5536 3.1.4
+	my ($server_name, $newsgroups) = split(/ /, $xref, 2);
+	$newsgroups =~ s/:[0-9]+\b//g; # drop NNTP article numbers
+	$newsgroups =~ tr/ /,/;
+	$hdr->header_set('Newsgroups', $newsgroups);
+
+	# *something* here is required for leafnode, try to follow
+	# RFC 5536 3.1.5...
+	$hdr->header_set('Path', $server_name . '!not-for-mail');
+
 	header_append($hdr, 'List-Post', "<mailto:$ibx->{-primary_address}>");
 	if (my $url = $ibx->base_url) {
 		$mid = mid_escape($mid);