gitweb: True fix: Support for the standard mime.types map in gitweb
True fix for error in mimetype_guess, error introduced in original commit 2d00737489b8c61ed616b261c7c9bd314e2b0b41 and later fixed temporarily by commenting out the line that caused error in commit 57bd4d3523efecf60197040cad34154aff4ddf80. 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>
Jakub Narebski committed
Aug 14, 2006 at 02:16 UTC
d5aa50de621220d7451a5d497479327d2a608009
1 file changed
+4
-1
gitweb/gitweb.perl
+4
-1
@@ -880,7 +880,10 @@ sub mimetype_guess {
880
881
if ($mimetypes_file) {
882
my $file = $mimetypes_file;
883
- #$file =~ m#^/# or $file = "$projectroot/$path/$file";
883
+ if ($file !~ m!^/!) { # if it is relative path
884
+ # it is relative to project
885
+ $file = "$projectroot/$project/$file";
886
+ }
887
$mime = mimetype_guess_file($filename, $file);
888
}
889
$mime ||= mimetype_guess_file($filename, '/etc/mime.types');