* [PATCH 4/6] wwwstatic: do not open() files for HEAD requests
2020-01-01 10:38 4% [PATCH 0/6] wwwstatic: support directory listings Eric Wong
@ 2020-01-01 10:38 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-01 10:38 UTC (permalink / raw)
To: meta
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 ];
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/6] wwwstatic: support directory listings
@ 2020-01-01 10:38 4% Eric Wong
2020-01-01 10:38 7% ` [PATCH 4/6] wwwstatic: do not open() files for HEAD requests Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-01 10:38 UTC (permalink / raw)
To: meta
Now it'll be possible to replicate the timeless web design
of https://public-inbox.org/ with our own PSGI code!
I imagine per-inbox docroots might be useful for serving git
bundles, tarball releases, bundles, and maybe altid snapshots,
too.
Eric Wong (6):
wwwstatic: implement Last-Modified and If-Modified-Since
www: move more logic into path_info_raw
wwwstatic: move r(...) functions here
wwwstatic: do not open() files for HEAD requests
wwwstatic: avoid TOCTTOU for FIFO check
wwwstatic: add directory listing + index.html support
MANIFEST | 1 +
lib/PublicInbox/Cgit.pm | 9 +-
lib/PublicInbox/GitHTTPBackend.pm | 19 +--
lib/PublicInbox/WWW.pm | 23 +--
lib/PublicInbox/WwwHighlight.pm | 9 +-
lib/PublicInbox/WwwStatic.pm | 256 ++++++++++++++++++++++++++++--
t/www_static.t | 96 +++++++++++
xt/git-http-backend.t | 20 +++
8 files changed, 368 insertions(+), 65 deletions(-)
create mode 100644 t/www_static.t
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-01 10:38 4% [PATCH 0/6] wwwstatic: support directory listings Eric Wong
2020-01-01 10:38 7% ` [PATCH 4/6] wwwstatic: do not open() files for HEAD requests 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).