[PATCH 8/9] gitweb: True fix: Support for the standard mime.types map in gitweb

From

Jakub Narebski <jnareb@gmail.com>

Date

Aug 14, 2006, 00:16 UTC

Message-ID

<200608140216.34150.jnareb@gmail.com>

In-Reply-To

<200608140202.46160.jnareb@gmail.com>

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

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Perhaps commit message should consist only of:

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

 gitweb/gitweb.perl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 52ae2aa..15875a8 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');

-- 
1.4.1.1