summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-20 03:00:13 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-20 03:00:13 -0700
commit02ca920481dbc3740087986b15b89cf6433cf58e (patch)
tree34777f38b374a829685500c1425cfbf95488da72
parentMerge branch 'master' into next (diff)
parentFix: Support for the standard mime.types map in gitweb (diff)
downloadtgif-02ca920481dbc3740087986b15b89cf6433cf58e.tar.xz
Merge branch 'jn/web' into next
-rwxr-xr-xgitweb/gitweb.cgi2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index d7da6368ce..78e6dd0346 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -1518,7 +1518,7 @@ sub mimetype_guess {
if ($mimetypes_file) {
my $file = $mimetypes_file;
- $file =~ m#^/# or $file = "$projectroot/$path/$file";
+ #$file =~ m#^/# or $file = "$projectroot/$path/$file";
$mime = mimetype_guess_file($filename, $file);
}
$mime ||= mimetype_guess_file($filename, '/etc/mime.types');