From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:42:48 +0000 (-0700)
Subject: Merge branch 'wk/gitweb-snapshot-use-if-modified-since'
X-Git-Tag: v1.7.11-rc0~146
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0f3ddd4a3abe863fae9c36ec4311ac936a2d8ed9?ds=inline;hp=-c

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.
---

0f3ddd4a3abe863fae9c36ec4311ac936a2d8ed9
diff --combined gitweb/gitweb.perl
index ca6f038c94,ede804af3d..4171de86e3
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -3886,7 -3886,6 +3886,7 @@@ sub print_feed_meta 
  				'-type' => "application/$type+xml"
  			);
  
 +			$href_params{'extra_options'} = undef;
  			$href_params{'action'} = $type;
  			$link_attr{'-href'} = href(%href_params);
  			print "<link ".
@@@ -7004,6 -7003,28 +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 -7051,10 +7052,10 @@@
  
  	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 -7064,15 +7065,15 @@@
  	}
  
  	$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 -7852,14 +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.