From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1637A1F466 for ; Wed, 1 Jan 2020 10:39:00 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Date: Wed, 1 Jan 2020 10:38:54 +0000 Message-Id: <20200101103859.15401-2-e@80x24.org> In-Reply-To: <20200101103859.15401-1-e@80x24.org> References: <20200101103859.15401-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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) {