From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 02/12] nntp: HDR returns 225, not 224
Date: Wed, 30 Sep 2015 21:00:17 +0000 [thread overview]
Message-ID: <20150930210027.30479-3-e@80x24.org> (raw)
In-Reply-To: <20150930210027.30479-1-e@80x24.org>
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(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 95aa4af..faa7563 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);
--
EW
next prev parent reply other threads:[~2015-09-30 21:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 21:00 [PATCH 0/12] another round of NNTP updates Eric Wong
2015-09-30 21:00 ` [PATCH 01/12] search: remove get_subject_path Eric Wong
2015-09-30 21:00 ` Eric Wong [this message]
2015-09-30 21:00 ` [PATCH 03/12] nntp: reduce syscalls for LIST OVERVIEW.FMT Eric Wong
2015-09-30 21:00 ` [PATCH 04/12] remove unnecessary fields usage Eric Wong
2015-09-30 21:00 ` [PATCH 05/12] daemon: always autoflush stdout/stderr Eric Wong
2015-09-30 21:00 ` [PATCH 06/12] nntpd: avoid lazy require Eric Wong
2015-09-30 21:00 ` [PATCH 07/12] INSTALL: document Danga::Socket dependency for nntpd Eric Wong
2015-09-30 21:00 ` [PATCH 08/12] nntp: MODE READER denies posting Eric Wong
2015-09-30 21:00 ` [PATCH 09/12] nntp: implement LIST HEADERS Eric Wong
2015-09-30 21:00 ` [PATCH 10/12] nntp: implement OVER/XOVER summary in search document Eric Wong
2015-09-30 21:00 ` [PATCH 11/12] t/nntpd.t: simplify condition for response termination Eric Wong
2015-09-30 21:00 ` [PATCH 12/12] t/nntpd.t: additional tests for XHDR/HDR 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=20150930210027.30479-3-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).