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

gitweb: True fix: Support for the standard mime.types map in gitweb

Browse Source 
True fix for error in mimetype_guess, error introduced in original commit
2d00737489 and later fixed temporarily
by commenting out the line that caused error in commit
57bd4d3523.

Gitweb now supports mime.types map $mimetypes_file relative to project.

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-08-14 02:16:33 +02:00 committed by Junio C Hamano
parent 618918e541
commit d5aa50de62
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitweb/gitweb.perl
View File

@ -880,7 +880,10 @@ sub mimetype_guess {
if ($mimetypes_file) { if ($mimetypes_file) {
my $file = $mimetypes_file; my $file = $mimetypes_file;
#$file =~ m#^/# or $file = "$projectroot/$path/$file"; if ($file !~ m!^/!) { # if it is relative path
# it is relative to project
$file = "$projectroot/$project/$file";
}
$mime = mimetype_guess_file($filename, $file); $mime = mimetype_guess_file($filename, $file);
} }
$mime ||= mimetype_guess_file($filename, '/etc/mime.types'); $mime ||= mimetype_guess_file($filename, '/etc/mime.types');