From: Jakub Narebski <jnareb@gmail.com>
To: "W. Trevor King" <wking@drexel.edu>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v7 3/3] gitweb: add If-Modified-Since handling to git_snapshot().
Date: Wed, 28 Mar 2012 19:11:31 +0100 [thread overview]
Message-ID: <201203282011.32148.jnareb@gmail.com> (raw)
In-Reply-To: <81004880a876bb9b9f607129956363d3167bff72.1332956550.git.wking@drexel.edu>
W. Trevor King wrote:
> @@ -7060,9 +7064,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 . '"',
> + -last_modified => (%co ? $latest_date{'rfc2822'} : ()),
> -status => '200 OK');
I'm sorry to be bearer of bad news, but this is still incorrect.
It should be:
print $cgi->header(
-type => $known_snapshot_formats{$format}{'type'},
-content_disposition => 'inline; filename="' . $filename . '"',
+ %co ? (-last_modified => $latest_date{'rfc2822'}) : (),
-status => '200 OK');
(The "fat comma" => operator has relatively low priority, lower than
ternary conditional operator ?:)
> +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.output &&
> + ! grep "Last-Modified" gitweb.output
> +'
> +test_debug 'cat gitweb.headers'
And it was not caught by test because CGI.pm can output the last modified
header as "Last-modified" (RFC 2616, sec 4.2 states "Field names are
case-insensitive"), so the last check should be
+ ! grep -i "Last-Modified" gitweb.output
Hmmm... why we use gitweb.output and not gitweb.headers? Is it consistency
with earlier tests?
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2012-03-28 18:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120328164513.GA4389@odin.tremily.us>
2012-03-28 17:44 ` [PATCH v7 0/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-28 17:44 ` [PATCH v7 1/3] gitweb: add `status` headers to git_feed() responses W. Trevor King
2012-03-28 17:44 ` [PATCH v7 2/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-28 17:44 ` [PATCH v7 3/3] gitweb: add If-Modified-Since handling to git_snapshot() W. Trevor King
2012-03-28 18:11 ` Jakub Narebski [this message]
2012-03-28 18:37 ` W. Trevor King
2012-03-28 19:11 ` Junio C Hamano
2012-03-28 19:27 ` W. Trevor King
2012-03-28 21:45 ` Jakub Narebski
2012-03-28 21:28 ` Jakub Narebski
2012-03-29 12:45 ` [PATCH v8 0/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-29 12:45 ` [PATCH v8 1/3] gitweb: add `status` headers to git_feed() responses W. Trevor King
2012-03-30 15:21 ` Jakub Narebski
2012-03-29 12:45 ` [PATCH v8 2/3] gitweb: refactor If-Modified-Since handling W. Trevor King
2012-03-30 15:30 ` Jakub Narebski
2012-03-29 12:45 ` [PATCH v8 3/3] gitweb: add If-Modified-Since handling to git_snapshot() W. Trevor King
2012-03-30 16:07 ` Jakub Narebski
2012-03-30 16:11 ` [PATCH v8 0/3] gitweb: refactor If-Modified-Since handling Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201203282011.32148.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=wking@drexel.edu \
/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 NNTP newsgroup(s).