undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Add charset info to "raw" output of 'text/plain' blobs

Browse Source 
Earlier "blob_plain" view sent "charset=utf-8" only when gitweb
guessed the content type to be text by reading from it, and not when
the MIME type was obtained from /etc/mime.types, or when gitweb
couldn't guess mimetype and used $default_blob_plain_mimetype.

This fixes the bug by always add charset info from
$default_text_plain_charset (if it is defined) to "raw" (a=blob_plain)
output for 'text/plain' blobs.

Generating information for Content-Type: header got separated into
blob_contenttype() subroutine; adding charset info in a special case
was removed from blob_mimetype(), which now should return mimetype
only.

While at it cleanup code a bit: put subroutine parameter
initialization first, make error message more robust (when $file_name
is not defined) if more cryptic, remove unnecessary '"' around
variable ("$var" -> $var).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski 2008-06-03 16:47:10 +02:00 committed by Junio C Hamano
parent dd613e6b87
commit 7f718e8b46
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gitweb/gitweb.perl
View File

@ -2481,8 +2481,7 @@ sub blob_mimetype {
return $default_blob_plain_mimetype unless $fd; return $default_blob_plain_mimetype unless $fd;
if (-T $fd) { if (-T $fd) {
return 'text/plain' . return 'text/plain';
($default_text_plain_charset ? '; charset='.$default_text_plain_charset : '');
} elsif (! $filename) { } elsif (! $filename) {
return 'application/octet-stream'; return 'application/octet-stream';
} elsif ($filename =~ m/\.png$/i) { } elsif ($filename =~ m/\.png$/i) {
@ -2496,6 +2495,17 @@ sub blob_mimetype {
} }
} }
sub blob_contenttype {
my ($fd, $file_name, $type) = @_;
$type ||= blob_mimetype($fd, $file_name);
if ($type eq 'text/plain' && defined $default_text_plain_charset) {
$type .= "; charset=$default_text_plain_charset";
}
return $type;
}
## ====================================================================== ## ======================================================================
## functions printing HTML: header, footer, error page ## functions printing HTML: header, footer, error page
@ -4374,6 +4384,7 @@ sub git_heads {
} }
sub git_blob_plain { sub git_blob_plain {
my $type = shift;
my $expires; my $expires;
if (!defined $hash) { if (!defined $hash) {
@ -4389,13 +4400,13 @@ sub git_blob_plain {
$expires = "+1d"; $expires = "+1d";
} }
my $type = shift;
open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Couldn't cat $file_name, $hash"); or die_error(undef, "Open git-cat-file blob '$hash' failed");
$type ||= blob_mimetype($fd, $file_name); # content-type (can include charset)
$type = blob_contenttype($fd, $file_name, $type);
# save as filename, even when no $file_name is given # "save as" filename, even when no $file_name is given
my $save_as = "$hash"; my $save_as = "$hash";
if (defined $file_name) { if (defined $file_name) {
$save_as = $file_name; $save_as = $file_name;
@ -4404,9 +4415,9 @@ 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="' . $save_as . '"');
undef $/; undef $/;
binmode STDOUT, ':raw'; binmode STDOUT, ':raw';
print <$fd>; print <$fd>;