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 1/6] wwwstatic: implement Last-Modified and If-Modified-Since
Date: Wed,  1 Jan 2020 10:38:54 +0000	[thread overview]
Message-ID: <20200101103859.15401-2-e@80x24.org> (raw)
In-Reply-To: <20200101103859.15401-1-e@80x24.org>

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) {

  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 ` Eric Wong [this message]
2020-01-01 19:07   ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since 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 ` [PATCH 4/6] wwwstatic: do not open() files for HEAD requests Eric Wong
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-2-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).