From: Martin Waitz <tali@admingilde.org>
To: git@vger.kernel.org
Subject: [PATCH] gitweb: use correct mime type even if filename has multiple dots.
Date: Sat, 16 Sep 2006 23:09:33 +0200 [thread overview]
Message-ID: <20060916210933.GX17042@admingilde.org> (raw)
Match the last part of the filename agains the extention from the
mime database instead of insisting that it starts at the first dot.
Signed-off-by: Martin Waitz <tali@admingilde.org>
---
gitweb/gitweb.perl | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ee561c6..7501251 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1106,7 +1106,6 @@ sub mimetype_guess_file {
my $mimemap = shift;
-r $mimemap or return undef;
- my %mimemap;
open(MIME, $mimemap) or return undef;
while (<MIME>) {
next if m/^#/; # skip comments
@@ -1114,14 +1113,16 @@ sub mimetype_guess_file {
if (defined $exts) {
my @exts = split(/\s+/, $exts);
foreach my $ext (@exts) {
- $mimemap{$ext} = $mime;
+ if ($filename =~ /\.$ext$/) {
+ close(MIME);
+ return $mime;
+ }
}
}
}
close(MIME);
- $filename =~ /\.(.*?)$/;
- return $mimemap{$1};
+ return undef;
}
sub mimetype_guess {
--
1.4.2.gb8b6b
--
Martin Waitz
next reply other threads:[~2006-09-16 21:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-16 21:09 Martin Waitz [this message]
2006-09-16 21:44 ` [PATCH] gitweb: use correct mime type even if filename has multiple dots Jakub Narebski
2006-09-17 7:51 ` Martin Waitz
2006-09-17 8:23 ` Jakub Narebski
2006-09-19 8:29 ` Martin Waitz
2006-09-19 11:57 ` [PATCH] gitweb: Fix mimetype_guess_file for files with multiple extensions Jakub Narebski
2006-09-17 8:41 ` [PATCH] gitweb: use correct mime type even if filename has multiple dots Junio C Hamano
2006-09-17 8:56 ` Jakub Narebski
2006-09-17 9:07 ` Junio C Hamano
2006-09-19 9:23 ` Martin Waitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060916210933.GX17042@admingilde.org \
--to=tali@admingilde.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.