Because snapshots can be large, you can save some bandwidth by
supporting caching via If-Modified-Since. This patch adds support for
the i-m-s request to git_snapshot() if the requested hash is a commit.
Requests for snapshots of tree-ishes, which lack well defined
timestamps, are still handled as they were before.
Signed-off-by: W Trevor King <wking@xxxxxxxxxx>
---
gitweb/gitweb.perl | 21 +++++++++++++++---
t/t9501-gitweb-standalone-http-status.sh | 33 ++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 229f3da..be9ad5d 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -7051,6 +7051,10 @@ sub git_snapshot {
my ($name, $prefix) = snapshot_name($project, $hash);
my $filename = "$name$known_snapshot_formats{$format}{'suffix'}";
+
+ my %co = parse_commit($hash);
+ die_if_unmodified($co{'committer_epoch'}) if %co;
+
my $cmd = quote_command(
git_cmd(), 'archive',
"--format=$known_snapshot_formats{$format}{'format'}",
@@ -7060,10 +7064,19 @@ sub git_snapshot {
}
$filename =~ s/(["\\])/\\$1/g;
- print $cgi->header(
- -type => $known_snapshot_formats{$format}{'type'},
- -content_disposition => 'inline; filename="' . $filename . '"',
- -status => '200 OK');
+ if (%co) {
+ my %latest_date = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
+ print $cgi->header(
+ -type => $known_snapshot_formats{$format}{'type'},
+ -content_disposition => 'inline; filename="' . $filename . '"',
+ -last_modified => $latest_date{'rfc2822'},
+ -status => '200 OK');
+ } else {
+ print $cgi->header(
+ -type => $known_snapshot_formats{$format}{'type'},
+ -content_disposition => 'inline; filename="' . $filename . '"',
+ -status => '200 OK');
+ }
open my $fd, "-|", $cmd
or die_error(500, "Execute git-archive failed");
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 0e49f29..38e90bd 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -138,6 +138,39 @@ test_expect_success 'modification: feed if-modified-since (unmodified)' '
'
test_debug 'cat gitweb.headers'
+test_expect_success 'modification: snapshot last-modified' '
+ gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ grep "Status: 200 OK" gitweb.output
+ grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.output
+'
+test_debug 'cat gitweb.headers'
+
+test_expect_success 'modification: snapshot if-modified-since (modified)' '
+ export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+ gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ unset HTTP_IF_MODIFIED_SINCE &&
+ grep "Status: 200 OK" gitweb.output
+'
+test_debug 'cat gitweb.headers'
+
+test_expect_success 'modification: snapshot if-modified-since (unmodified)' '
+ export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
+ gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ unset HTTP_IF_MODIFIED_SINCE &&
+ grep "Status: 304 Not Modified" gitweb.output
+'
+test_debug 'cat gitweb.headers'
+
+test_expect_success 'modification: tree-ish snapshot' '
+ ID=`git rev-parse --verify HEAD^{tree}` &&
+ export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+ gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ unset HTTP_IF_MODIFIED_SINCE &&
+ grep "Status: 200 OK" gitweb.output &&
+ ! grep "Last-Modified" gitweb.output
+'
+test_debug 'cat gitweb.headers'
+
# ----------------------------------------------------------------------
# load checking
--
1.7.3.4
Attachment:
signature.asc
Description: OpenPGP digital signature