From 581a4d7fdea724512263ae9c0daef5b9a7f0affa Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Wed, 30 Sep 2015 21:00:17 +0000
Subject: nntp: HDR returns 225, not 224

This is stipulated by RFC 3977 8.5.1, but apparently I misread it.
---
 lib/PublicInbox/NNTP.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 95aa4af7..faa75634 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -16,6 +16,7 @@ use constant {
 	r501 => '501 command syntax error',
 	r221 => '221 Header follows',
 	r224 => '224 Overview information follows (multi-line)',
+	r225 =>	'225 Headers follow (multi-line)',
 	r430 => '430 No article with that message-id',
 	long_response_limit => 0xffffffff,
 };
@@ -554,7 +555,7 @@ sub hdr_message_id ($$$) { # optimize XHDR Message-ID [range] for slrnpull.
 		return $r unless ref $r;
 		my $mm = $self->{ng}->mm;
 		my ($beg, $end) = @$r;
-		more($self, '221 Header follows');
+		more($self, $xhdr ? r221 : r225);
 		$self->long_response($beg, $end, sub {
 			my ($i) = @_;
 			my $mid = $mm->mid_for($$i);
@@ -597,7 +598,7 @@ sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin
 		my $ng = $self->{ng};
 		my $mm = $ng->mm;
 		my ($beg, $end) = @$r;
-		more($self, '221 Header follows');
+		more($self, $xhdr ? r221 : r225);
 		$self->long_response($beg, $end, sub {
 			my ($i) = @_;
 			my $mid = $mm->mid_for($$i);
@@ -644,7 +645,7 @@ sub hdr_searchmsg ($$$$) {
 		my $r = get_range($self, $range);
 		return $r unless ref $r;
 		my ($beg, $end) = @$r;
-		more($self, '221 Header follows');
+		more($self, $xhdr ? r221 : r225);
 		$self->long_response($beg, $end, sub {
 			my ($i) = @_;
 			my $mid = $mm->mid_for($$i) or return;
@@ -702,7 +703,7 @@ sub hdr_mid_response ($$$$$$) {
 		$res .= r221 . "\r\n";
 		$res .= "$mid $v\r\n" if defined $v;
 	} else {
-		$res .= r224 . "\r\n";
+		$res .= r225 . "\r\n";
 		if (defined $v) {
 			my $pfx = hdr_mid_prefix($self, $xhdr, $ng, $n, $mid);
 			$res .= "$pfx $v\r\n";
@@ -726,7 +727,7 @@ sub hdr_slow ($$$$) {
 		my $r = get_range($self, $range);
 		return $r unless ref $r;
 		my ($beg, $end) = @$r;
-		more($self, $xhdr ? r221 : r224);
+		more($self, $xhdr ? r221 : r225);
 		$self->long_response($beg, $end, sub {
 			my ($i) = @_;
 			$r = $self->art_lookup($$i, 2);
-- 
cgit v1.2.3-24-ge0c7