gitweb: Quote filename in HTTP Content-Disposition: header

Finish work started by commit a2f3db2 (although not documented
in commit message) of quoting using quotemeta the filename in
HTTP -content_disposition header.

Just in case filename contains end of line character.

Also use consistent coding style to compute -content_disposition
parameter.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski 2006-09-26 01:59:43 +02:00 коммит произвёл Junio C Hamano
Родитель f93bff8d45
Коммит ab41dfbfd4
1 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -2320,7 +2320,7 @@ sub git_project_index {
print $cgi->header( print $cgi->header(
-type => 'text/plain', -type => 'text/plain',
-charset => 'utf-8', -charset => 'utf-8',
-content_disposition => qq(inline; filename="index.aux")); -content_disposition => 'inline; filename="index.aux"');
foreach my $pr (@projects) { foreach my $pr (@projects) {
if (!exists $pr->{'owner'}) { if (!exists $pr->{'owner'}) {
@ -2682,7 +2682,7 @@ sub git_blob_plain {
print $cgi->header( print $cgi->header(
-type => "$type", -type => "$type",
-expires=>$expires, -expires=>$expires,
-content_disposition => "inline; filename=\"$save_as\""); -content_disposition => 'inline; filename="' . quotemeta($save_as) . '"');
undef $/; undef $/;
binmode STDOUT, ':raw'; binmode STDOUT, ':raw';
print <$fd>; print <$fd>;
@ -2856,10 +2856,11 @@ sub git_snapshot {
my $filename = basename($project) . "-$hash.tar.$suffix"; my $filename = basename($project) . "-$hash.tar.$suffix";
print $cgi->header(-type => 'application/x-tar', print $cgi->header(
-content_encoding => $ctype, -type => 'application/x-tar',
-content_disposition => "inline; filename=\"$filename\"", -content_encoding => $ctype,
-status => '200 OK'); -content_disposition => 'inline; filename="' . quotemeta($filename) . '"',
-status => '200 OK');
my $git_command = git_cmd_str(); my $git_command = git_cmd_str();
open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
@ -3169,7 +3170,7 @@ sub git_blobdiff {
-type => 'text/plain', -type => 'text/plain',
-charset => 'utf-8', -charset => 'utf-8',
-expires => $expires, -expires => $expires,
-content_disposition => qq(inline; filename=") . quotemeta($file_name) . qq(.patch")); -content_disposition => 'inline; filename="' . quotemeta($file_name) . '.patch"');
print "X-Git-Url: " . $cgi->self_url() . "\n\n"; print "X-Git-Url: " . $cgi->self_url() . "\n\n";
@ -3272,7 +3273,7 @@ sub git_commitdiff {
-type => 'text/plain', -type => 'text/plain',
-charset => 'utf-8', -charset => 'utf-8',
-expires => $expires, -expires => $expires,
-content_disposition => qq(inline; filename="$filename")); -content_disposition => 'inline; filename="' . quotemeta($filename) . '"');
my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'}); my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
print <<TEXT; print <<TEXT;
From: $co{'author'} From: $co{'author'}