From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 05/12] nntp: XOVER does not require range
Date: Sat, 19 Sep 2015 02:03:33 +0000 [thread overview]
Message-ID: <20150919020340.6484-6-e@80x24.org> (raw)
In-Reply-To: <20150919020340.6484-1-e@80x24.org>
XOVER uses the current article if no range is given as
stipulated in RFC 2980.
---
lib/PublicInbox/NNTP.pm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 7a73573..8275ef0 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -434,7 +434,7 @@ sub cmd_help ($) {
'.'
}
-sub get_range ($;$) {
+sub get_range ($$) {
my ($self, $range) = @_;
my $ng = $self->{ng} or return '412 no news group has been selected';
defined $range or return '420 No article(s) selected';
@@ -508,11 +508,7 @@ sub long_response ($$$$) {
sub cmd_xhdr ($$;$) {
my ($self, $header, $range) = @_;
defined $self->{ng} or return '412 no news group currently selected';
- unless (defined $range) {
- defined($range = $self->{article}) or
- return '420 no current article has been selected';
- }
- if ($range =~ /\A<(.+)>\z/) { # Message-ID
+ if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
my $r = $self->art_lookup($range, 2);
return $r unless ref $r;
more($self, '221 Header follows');
@@ -521,6 +517,7 @@ sub cmd_xhdr ($$;$) {
}
'.';
} else { # numeric range
+ $range = $self->{article} unless defined $range;
my $r = get_range($self, $range);
return $r unless ref $r;
my ($beg, $end) = @$r;
@@ -537,6 +534,7 @@ sub cmd_xhdr ($$;$) {
sub cmd_xover ($;$) {
my ($self, $range) = @_;
+ $range = $self->{article} unless defined $range;
my $r = get_range($self, $range);
return $r unless ref $r;
my ($beg, $end) = @$r;
--
EW
next prev parent reply other threads:[~2015-09-19 2:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-19 2:03 [PATCH 0/12] nntp: misc updates Eric Wong
2015-09-19 2:03 ` [PATCH 01/12] nntp: use write_buf_size instead write_buf Eric Wong
2015-09-19 2:03 ` [PATCH 02/12] nntp: introduce long response API for streaming Eric Wong
2015-09-19 2:03 ` [PATCH 03/12] nntp: use long response API for LISTGROUP Eric Wong
2015-09-19 2:03 ` [PATCH 04/12] nntp: implement command argument checking Eric Wong
2015-09-19 2:03 ` Eric Wong [this message]
2015-09-19 2:03 ` [PATCH 06/12] nntp: speed up XHDR for the Message-ID case Eric Wong
2015-09-19 2:03 ` [PATCH 07/12] nntp: implement XROVER, speed up XHDR for some cases Eric Wong
2015-09-19 2:03 ` [PATCH 08/12] nntp: implement XPATH Eric Wong
2015-09-19 2:03 ` [PATCH 09/12] nntp: fix logging of long responses Eric Wong
2015-09-19 2:03 ` [PATCH 10/12] nntp: fix ARTICLE/HEAD/BODY/STAT Eric Wong
2015-09-19 2:03 ` [PATCH 11/12] nntp: log to FDs given by the Nntpd module Eric Wong
2015-09-19 2:03 ` [PATCH 12/12] nntp: article lookups by Message-ID may cross newsgroups 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=20150919020340.6484-6-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.
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).