diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-08-14 02:16:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-14 17:33:19 -0700 |
| commit | d5aa50de621220d7451a5d497479327d2a608009 (patch) | |
| tree | b7073dcdece41364f01e08e565fb95718aab3e40 | |
| parent | 618918e5411e2e769ad5e8d44c5d1cc363b983b5 (diff) | |
| download | git-d5aa50de621220d7451a5d497479327d2a608009.tar.gz git-d5aa50de621220d7451a5d497479327d2a608009.tar.xz | |
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>
| -rwxr-xr-x | gitweb/gitweb.perl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 52ae2aa86..15875a866 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -880,7 +880,10 @@ sub mimetype_guess { if ($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, '/etc/mime.types'); |