Re: [PATCH v4 2/3] gitweb: refactor If-Modified-Since handling
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 26, 2012, 17:12 UTC
- Message-ID
- <7v8vinqoaj.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20120326111203.GC2951@odin.tremily.us>
"W. Trevor King" <wking@drexel.edu> writes:
Show 21 quoted lines
> +sub die_if_unmodified {
> + 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;
> + }
> + }
> +}Show 9 quoted lines
> sub git_snapshot {
> my $format = $input_params{'snapshot_format'};
> if (!@snapshot_fmts) {
> @@ -7820,24 +7842,8 @@ sub git_feed {
> if (defined($commitlist[0])) {
> %latest_commit = %{$commitlist[0]};
> my $latest_epoch = $latest_commit{'committer_epoch'};
> + die_if_unmodified($latest_epoch);
> %latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});It might make more sense to call the helper *after* stuffing %latest_date and pass the $latest_date{'rfc2822'} as parameter to the new helper function, so that the helper function do not have to call parse_date().
The verb "die" everywhere else in the codebase of Git not just means an immediate exit, but means an imediate _error_ exit. The new helper function is not about failure, but merely is an early return. Perhaps rename it to exit_if_unmodified_since() or something?
Show 23 quoted lines
> diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh > index 31076ed..0e49f29 100755 > --- a/t/t9501-gitweb-standalone-http-status.sh > +++ b/t/t9501-gitweb-standalone-http-status.sh > @@ -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,31 @@ 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.output
Missing " &&" at the end (same in 3/3).
Show 19 quoted lines
> + grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.output > +' > +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" && > + gitweb_run "p=.git;a=atom;h=master" && > + unset HTTP_IF_MODIFIED_SINCE && > + grep "Status: 200 OK" gitweb.output > +' > +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" && > + gitweb_run "p=.git;a=atom;h=master" && > + unset HTTP_IF_MODIFIED_SINCE && > + grep "Status: 304 Not Modified" gitweb.output > +' > +test_debug 'cat gitweb.headers'
Other than that, the patch looks cleanly done.
Thanks.