unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/6] wwwstatic: do not open() files for HEAD requests
Date: Wed,  1 Jan 2020 10:38:57 +0000	[thread overview]
Message-ID: <20200101103859.15401-5-e@80x24.org> (raw)
In-Reply-To: <20200101103859.15401-1-e@80x24.org>

open() is a much more expensive syscall than stat(),
so avoid it
---
 lib/PublicInbox/WwwStatic.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index c605e64f..093a7920 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -51,7 +51,9 @@ sub prepare_range {
 		if ($len <= 0) {
 			$code = 416;
 		} else {
-			sysseek($in, $beg, SEEK_SET) or return r(500);
+			if ($in) {
+				sysseek($in, $beg, SEEK_SET) or return r(500);
+			}
 			push @$h, qw(Accept-Ranges bytes Content-Range);
 			push @$h, "bytes $beg-$end/$size";
 
@@ -70,8 +72,13 @@ sub response {
 	my ($env, $h, $path, $type) = @_;
 	return r(404) unless -f $path && -r _; # just in case it's a FIFO :P
 
-	open my $in, '<', $path or return;
-	my $size = -s $in;
+	my ($size, $in);
+	if ($env->{REQUEST_METHOD} eq 'HEAD') {
+		$size = -s _;
+	} else { # GET, callers should've already filtered out other methods
+		open $in, '<', $path or return r(403);
+		$size = -s $in;
+	}
 	my $mtime = time2str((stat(_))[9]);
 
 	if (my $ims = $env->{HTTP_IF_MODIFIED_SINCE}) {
@@ -86,13 +93,13 @@ sub response {
 		return $code if ref($code);
 	}
 	push @$h, 'Content-Length', $len, 'Last-Modified', $mtime;
-	my $body = bless {
+	my $body = $in ? bless {
 		initial_rd => 65536,
 		len => $len,
 		in => $in,
 		path => $path,
 		env => $env,
-	}, __PACKAGE__;
+	}, __PACKAGE__ : [];
 	[ $code, $h, $body ];
 }
 

  parent reply	other threads:[~2020-01-01 10:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-01 10:38 [PATCH 0/6] wwwstatic: support directory listings Eric Wong
2020-01-01 10:38 ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Eric Wong
2020-01-01 19:07   ` Eric Wong
2020-01-01 10:38 ` [PATCH 2/6] www: move more logic into path_info_raw Eric Wong
2020-01-01 10:38 ` [PATCH 3/6] wwwstatic: move r(...) functions here Eric Wong
2020-01-01 10:38 ` Eric Wong [this message]
2020-01-01 10:38 ` [PATCH 5/6] wwwstatic: avoid TOCTTOU for FIFO check Eric Wong
2020-01-01 10:38 ` [PATCH 6/6] wwwstatic: add directory listing + index.html support 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=20200101103859.15401-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.
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).