From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/7] nntp: avoid setting Bytes and Lines headers
Date: Tue, 22 Sep 2015 10:09:45 +0000 [thread overview]
Message-ID: <20150922100948.8160-5-e@80x24.org> (raw)
In-Reply-To: <20150922100948.8160-1-e@80x24.org>
These are internal metadata should be calculated, so avoid
leaking it into the header.
---
lib/PublicInbox/NNTP.pm | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 71b774d..e5bb683 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -374,18 +374,16 @@ found:
my $bytes;
my $s = eval { Email::MIME->new($ng->gcf->cat_file($o, \$bytes)) };
return $err unless $s;
+ my $lines;
if ($set_headers) {
$s->header_set('Newsgroups', $ng->{name});
- $s->header_set('Lines', $s->body =~ tr!\n!\n!);
$s->header_set('Xref', xref($ng, $n));
+ $lines = $s->body =~ tr!\n!\n!;
# must be last
- if ($set_headers == 2) {
- $s->header_set('Bytes', $bytes);
- $s->body_set('');
- }
+ $s->body_set('') if ($set_headers == 2);
}
- [ $n, $mid, $s ];
+ [ $n, $mid, $s, $bytes, $lines ];
}
sub simple_body_write ($$) {
@@ -399,13 +397,6 @@ sub simple_body_write ($$) {
'.'
}
-sub header_str ($) {
- my ($s) = @_;
- my $h = $s->header_obj;
- $h->header_set('Bytes');
- $h->as_string
-}
-
sub set_art {
my ($self, $art) = @_;
$self->{article} = $art if defined $art && $art =~ /\A\d+\z/;
@@ -418,7 +409,7 @@ sub cmd_article ($;$) {
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, $s->header_obj->as_string);
do_more($self, "\r\n");
simple_body_write($self, $s);
}
@@ -430,7 +421,7 @@ sub cmd_head ($;$) {
my ($n, $mid, $s) = @$r;
set_art($self, $art);
more($self, "221 $n <$mid> article retrieved - head follows");
- do_more($self, header_str($s));
+ do_more($self, $s->header_obj->as_string);
'.'
}
@@ -486,6 +477,9 @@ sub get_range ($$) {
sub xhdr ($$) {
my ($r, $header) = @_;
+ $header = lc $header;
+ return $r->[3] if ($header eq 'bytes');
+ return $r->[4] if ($header eq 'lines');
$r = $r->[2]->header_obj->header($header);
defined $r or return;
$r =~ s/[\r\n\t]+/ /sg;
--
EW
next prev parent reply other threads:[~2015-09-22 10:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 10:09 [PATCH 0/7] nntp: another round of updates Eric Wong
2015-09-22 10:09 ` [PATCH 1/7] t/nntpd.t: fix fcntl test to ensure no failures Eric Wong
2015-09-22 10:09 ` [PATCH 2/7] nntp: support YYYYMMDD dates for commands Eric Wong
2015-09-22 10:09 ` [PATCH 3/7] nntp: ensure body lines end with CRLF Eric Wong
2015-09-22 10:09 ` Eric Wong [this message]
2015-09-22 10:09 ` [PATCH 5/7] nntp: implement OVER from RFC 3977 Eric Wong
2015-09-22 10:09 ` [PATCH 6/7] nntp: XHDR fixes for Message-ID lookups Eric Wong
2015-09-22 10:09 ` [PATCH 7/7] nntp: XHDR lookups by Message-ID may cross groups 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=20150922100948.8160-5-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).