mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
Merge branch 'wk/gitweb-snapshot-use-if-modified-since'
Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header, based on the commit date. By W. Trevor King * wk/gitweb-snapshot-use-if-modified-since: gitweb: add If-Modified-Since handling to git_snapshot(). gitweb: refactor If-Modified-Since handling gitweb: add `status` headers to git_feed() responses.
This commit is contained in:
Junio C Hamano
commit
0f3ddd4a3a
@ -7004,6 +7004,28 @@ sub snapshot_name {
|
||||
return wantarray ? ($name, $name) : $name;
|
||||
}
|
||||
|
||||
sub exit_if_unmodified_since {
|
||||
my ($latest_epoch) = @_;
|
||||
our $cgi;
|
||||
|
||||
my $if_modified = $cgi->http('IF_MODIFIED_SINCE');
|
||||
if (defined $if_modified) {
|
||||
my $since;
|
||||
if (eval { require HTTP::Date; 1; }) {
|
||||
$since = HTTP::Date::str2time($if_modified);
|
||||
} elsif (eval { require Time::ParseDate; 1; }) {
|
||||
$since = Time::ParseDate::parsedate($if_modified, GMT => 1);
|
||||
}
|
||||
if (defined $since && $latest_epoch <= $since) {
|
||||
my %latest_date = parse_date($latest_epoch);
|
||||
print $cgi->header(
|
||||
-last_modified => $latest_date{'rfc2822'},
|
||||
-status => '304 Not Modified');
|
||||
goto DONE_GITWEB;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub git_snapshot {
|
||||
my $format = $input_params{'snapshot_format'};
|
||||
if (!@snapshot_fmts) {
|
||||
@ -7030,6 +7052,10 @@ sub git_snapshot {
|
||||
|
||||
my ($name, $prefix) = snapshot_name($project, $hash);
|
||||
my $filename = "$name$known_snapshot_formats{$format}{'suffix'}";
|
||||
|
||||
my %co = parse_commit($hash);
|
||||
exit_if_unmodified_since($co{'committer_epoch'}) if %co;
|
||||
|
||||
my $cmd = quote_command(
|
||||
git_cmd(), 'archive',
|
||||
"--format=$known_snapshot_formats{$format}{'format'}",
|
||||
@ -7039,9 +7065,15 @@ sub git_snapshot {
|
||||
}
|
||||
|
||||
$filename =~ s/(["\\])/\\$1/g;
|
||||
my %latest_date;
|
||||
if (%co) {
|
||||
%latest_date = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
|
||||
}
|
||||
|
||||
print $cgi->header(
|
||||
-type => $known_snapshot_formats{$format}{'type'},
|
||||
-content_disposition => 'inline; filename="' . $filename . '"',
|
||||
%co ? (-last_modified => $latest_date{'rfc2822'}) : (),
|
||||
-status => '200 OK');
|
||||
|
||||
open my $fd, "-|", $cmd
|
||||
@ -7821,33 +7853,14 @@ sub git_feed {
|
||||
if (defined($commitlist[0])) {
|
||||
%latest_commit = %{$commitlist[0]};
|
||||
my $latest_epoch = $latest_commit{'committer_epoch'};
|
||||
%latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});
|
||||
my $if_modified = $cgi->http('IF_MODIFIED_SINCE');
|
||||
if (defined $if_modified) {
|
||||
my $since;
|
||||
if (eval { require HTTP::Date; 1; }) {
|
||||
$since = HTTP::Date::str2time($if_modified);
|
||||
} elsif (eval { require Time::ParseDate; 1; }) {
|
||||
$since = Time::ParseDate::parsedate($if_modified, GMT => 1);
|
||||
}
|
||||
if (defined $since && $latest_epoch <= $since) {
|
||||
print $cgi->header(
|
||||
-type => $content_type,
|
||||
-charset => 'utf-8',
|
||||
-last_modified => $latest_date{'rfc2822'},
|
||||
-status => '304 Not Modified');
|
||||
return;
|
||||
}
|
||||
}
|
||||
print $cgi->header(
|
||||
-type => $content_type,
|
||||
-charset => 'utf-8',
|
||||
-last_modified => $latest_date{'rfc2822'});
|
||||
} else {
|
||||
print $cgi->header(
|
||||
-type => $content_type,
|
||||
-charset => 'utf-8');
|
||||
exit_if_unmodified_since($latest_epoch);
|
||||
%latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});
|
||||
}
|
||||
print $cgi->header(
|
||||
-type => $content_type,
|
||||
-charset => 'utf-8',
|
||||
%latest_date ? (-last_modified => $latest_date{'rfc2822'}) : (),
|
||||
-status => '200 OK');
|
||||
|
||||
# Optimization: skip generating the body if client asks only
|
||||
# for Last-Modified date.
|
||||
|
||||
@ -92,7 +92,7 @@ test_debug 'cat gitweb.output'
|
||||
test_expect_success 'snapshots: bad tree-ish id (tagged object)' '
|
||||
echo object > tag-object &&
|
||||
git add tag-object &&
|
||||
git commit -m "Object to be tagged" &&
|
||||
test_tick && git commit -m "Object to be tagged" &&
|
||||
git tag tagged-object `git hash-object tag-object` &&
|
||||
gitweb_run "p=.git;a=snapshot;h=tagged-object;sf=tgz" &&
|
||||
grep "400 - Object is not a tree-ish" gitweb.output
|
||||
@ -112,6 +112,64 @@ test_expect_success 'snapshots: bad object id' '
|
||||
'
|
||||
test_debug 'cat gitweb.output'
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# modification times (Last-Modified and If-Modified-Since)
|
||||
|
||||
test_expect_success 'modification: feed last-modified' '
|
||||
gitweb_run "p=.git;a=atom;h=master" &&
|
||||
grep "Status: 200 OK" gitweb.headers &&
|
||||
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
|
||||
'
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success 'modification: feed if-modified-since (modified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=atom;h=master" &&
|
||||
grep "Status: 200 OK" gitweb.headers
|
||||
'
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success 'modification: feed if-modified-since (unmodified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=atom;h=master" &&
|
||||
grep "Status: 304 Not Modified" gitweb.headers
|
||||
'
|
||||
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.headers &&
|
||||
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
|
||||
'
|
||||
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" &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
|
||||
grep "Status: 200 OK" gitweb.headers
|
||||
'
|
||||
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" &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
|
||||
grep "Status: 304 Not Modified" gitweb.headers
|
||||
'
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success 'modification: tree snapshot' '
|
||||
ID=`git rev-parse --verify HEAD^{tree}` &&
|
||||
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
|
||||
grep "Status: 200 OK" gitweb.headers &&
|
||||
! grep -i "last-modified" gitweb.headers
|
||||
'
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# load checking
|
||||
|
||||
Loading…
Reference in New Issue
Block a user