* [PATCH 10/12] nntp: fix ARTICLE/HEAD/BODY/STAT
2015-09-19 2:03 6% [PATCH 0/12] nntp: misc updates Eric Wong
@ 2015-09-19 2:03 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-09-19 2:03 UTC (permalink / raw)
To: meta
Article number is optional, but we need to update the
article number of the client connection if it was specified
(but not if it was given a Message-ID) as stipulated by
RFC 977
---
lib/PublicInbox/NNTP.pm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 3ded0de..01039ba 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -388,41 +388,50 @@ sub header_str ($) {
$h->as_string
}
-sub cmd_article ($$) {
+sub set_art {
+ my ($self, $art) = @_;
+ $self->{article} = $art if defined $art && $art =~ /\A\d+\z/;
+}
+
+sub cmd_article ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 1);
return $r unless ref $r;
my ($n, $mid, $s) = @$r;
+ set_art($self, $art);
more($self, "220 $n <$mid> article retrieved - head and body follow");
do_more($self, header_str($s));
do_more($self, "\r\n");
simple_body_write($self, $s);
}
-sub cmd_head ($$) {
+sub cmd_head ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 2);
return $r unless ref $r;
my ($n, $mid, $s) = @$r;
+ set_art($self, $art);
more($self, "221 $n <$mid> article retrieved - head follows");
do_more($self, header_str($s));
'.'
}
-sub cmd_body ($$) {
+sub cmd_body ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 0);
return $r unless ref $r;
my ($n, $mid, $s) = @$r;
+ set_art($self, $art);
more($self, "222 $n <$mid> article retrieved - body follows");
simple_body_write($self, $s);
}
-sub cmd_stat ($$) {
+sub cmd_stat ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 0);
return $r unless ref $r;
my ($n, $mid, undef) = @$r;
+ set_art($self, $art);
"223 $n <$mid> article retrieved - request text separately";
}
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/12] nntp: misc updates
@ 2015-09-19 2:03 6% Eric Wong
2015-09-19 2:03 7% ` [PATCH 10/12] nntp: fix ARTICLE/HEAD/BODY/STAT Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-09-19 2:03 UTC (permalink / raw)
To: meta
Still not changing or adding new caches or modifying our data layout,
but things seem to work well for the common case.
The most important change is the new long response API which will help
us even after any future optimizations we make. We should be able to
stream millions of messages without excessive buffering and memory
usage.
Eric Wong (12):
nntp: use write_buf_size instead write_buf
nntp: introduce long response API for streaming
nntp: use long response API for LISTGROUP
nntp: implement command argument checking
nntp: XOVER does not require range
nntp: speed up XHDR for the Message-ID case
nntp: implement XROVER, speed up XHDR for some cases
nntp: implement XPATH
nntp: fix logging of long responses
nntp: fix ARTICLE/HEAD/BODY/STAT
nntp: log to FDs given by the Nntpd module
nntp: article lookups by Message-ID may cross newsgroups
lib/PublicInbox/Msgmap.pm | 24 +--
lib/PublicInbox/NNTP.pm | 419 ++++++++++++++++++++++++++++++++-----------
lib/PublicInbox/SearchMsg.pm | 1 +
public-inbox-nntpd | 2 +
4 files changed, 330 insertions(+), 116 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-09-19 2:03 6% [PATCH 0/12] nntp: misc updates Eric Wong
2015-09-19 2:03 7% ` [PATCH 10/12] nntp: fix ARTICLE/HEAD/BODY/STAT Eric Wong
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).