* Re: [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since
2020-01-01 10:38 6% ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Eric Wong
@ 2020-01-01 19:07 7% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-01-01 19:07 UTC (permalink / raw)
To: meta
Eric Wong <e@80x24.org> wrote:
> We're already static files for cgit, and will serve more
^- "serving"
> static files, soon.
^ permalink raw reply [relevance 7%]
* [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since
2020-01-01 10:38 5% [PATCH 0/6] wwwstatic: support directory listings Eric Wong
@ 2020-01-01 10:38 6% ` Eric Wong
2020-01-01 19:07 7% ` Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-01-01 10:38 UTC (permalink / raw)
To: meta
We're already static files for cgit, and will serve more
static files, soon.
---
lib/PublicInbox/WwwStatic.pm | 10 ++++++++--
xt/git-http-backend.t | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index 58db58b4..b8efcf62 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -4,6 +4,7 @@
package PublicInbox::WwwStatic;
use strict;
use Fcntl qw(:seek);
+use HTTP::Date qw(time2str);
sub prepare_range {
my ($env, $in, $h, $beg, $end, $size) = @_;
@@ -50,9 +51,14 @@ sub response {
my ($env, $h, $path, $type) = @_;
return unless -f $path && -r _; # just in case it's a FIFO :P
- # TODO: If-Modified-Since and Last-Modified?
open my $in, '<', $path or return;
my $size = -s $in;
+ my $mtime = time2str((stat(_))[9]);
+
+ if (my $ims = $env->{HTTP_IF_MODIFIED_SINCE}) {
+ return [ 304, [], [] ] if $mtime eq $ims;
+ }
+
my $len = $size;
my $code = 200;
push @$h, 'Content-Type', $type;
@@ -63,7 +69,7 @@ sub response {
return [ 416, $h, [] ];
}
}
- push @$h, 'Content-Length', $len;
+ push @$h, 'Content-Length', $len, 'Last-Modified', $mtime;
my $body = bless {
initial_rd => 65536,
len => $len,
diff --git a/xt/git-http-backend.t b/xt/git-http-backend.t
index 421c6316..7f34d452 100644
--- a/xt/git-http-backend.t
+++ b/xt/git-http-backend.t
@@ -8,6 +8,7 @@ use warnings;
use Test::More;
use POSIX qw(setsid);
use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(which);
my $git_dir = $ENV{GIANT_GIT_DIR};
plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
@@ -74,6 +75,25 @@ SKIP: {
}
}
+SKIP: { # make sure Last-Modified + If-Modified-Since works with curl
+ my $nr = 6;
+ skip 'no description', $nr unless -f "$git_dir/description";
+ my $mtime = (stat(_))[9];
+ my $curl = which('curl');
+ skip 'curl(1) not found', $nr unless $curl;
+ my $url = "http://$host:$port/description";
+ my $dst = "$tmpdir/desc";
+ is(system($curl, qw(-RsSf), '-o', $dst, $url), 0, 'curl -R');
+ is((stat($dst))[9], $mtime, 'curl used remote mtime');
+ is(system($curl, qw(-sSf), '-z', $dst, '-o', "$dst.2", $url), 0,
+ 'curl -z noop');
+ ok(!-e "$dst.2", 'no modification, nothing retrieved');
+ utime(0, 0, $dst) or die "utime failed: $!";
+ is(system($curl, qw(-sSfR), '-z', $dst, '-o', "$dst.2", $url), 0,
+ 'curl -z updates');
+ ok(-e "$dst.2", 'faked modification, got new file retrieved');
+}
+
{
my $c = fork;
if ($c == 0) {
^ permalink raw reply related [relevance 6%]
* [PATCH 0/6] wwwstatic: support directory listings
@ 2020-01-01 10:38 5% Eric Wong
2020-01-01 10:38 6% ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Eric Wong
0 siblings, 1 reply; 3+ 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 5%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-01 10:38 5% [PATCH 0/6] wwwstatic: support directory listings Eric Wong
2020-01-01 10:38 6% ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Eric Wong
2020-01-01 19:07 7% ` 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).