# [PATCH] gitweb: allow space as delimiter in mime.types 5 messages from 2011-06-14 to 2011-06-15. Participants: Ludwig Nussel, Jakub Narebski, J.H., Junio C Hamano. Thread: https://gitlist.dev/t/27623 ## Ludwig Nussel, 2011-06-14 14:09 Subject: [PATCH] gitweb: allow space as delimiter in mime.types Message-ID: <1308060595-28294-1-git-send-email-ludwig.nussel@suse.de> URL: https://gitlist.dev/e/1308060595-28294-1-git-send-email-ludwig.nussel%40suse.de ``` in openSUSE /etc/mime.types has only spaces. I don't know if there's a canonical reference that says that only tabs are allowed. Mutt at least also accepts spaces. So make gitweb more liberal too. --- gitweb/gitweb.perl | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1b83a8d..d81d87b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3560,12 +3560,9 @@ sub mimetype_guess_file { open(my $mh, '<', $mimemap) or return undef; while (<$mh>) { next if m/^#/; # skip comments - my ($mimetype, $exts) = split(/\t+/); - if (defined $exts) { - my @exts = split(/\s+/, $exts); - foreach my $ext (@exts) { - $mimemap{$ext} = $mimetype; - } + my ($mimetype, @exts) = split(/\s+/); + foreach my $ext (@exts) { + $mimemap{$ext} = $mimetype; } } close($mh); -- 1.7.3.4 ``` ## Jakub Narebski, 2011-06-14 14:59 Subject: Re: [PATCH] gitweb: allow space as delimiter in mime.types Message-ID: URL: https://gitlist.dev/e/m3ips8v4s2.fsf%40localhost.localdomain In-Reply-To: <1308060595-28294-1-git-send-email-ludwig.nussel@suse.de> ``` Ludwig Nussel writes: > Subject: [PATCH] gitweb: allow space as delimiter in mime.types A very minor nitpick: perhaps "work with" rather than "allow" would be better? > in openSUSE /etc/mime.types has only spaces. I don't know if there's > a canonical reference that says that only tabs are allowed. Mutt at > least also accepts spaces. So make gitweb more liberal too. Ack. It is obviously correct, as names of MUME types cannot contain spaces, it makes gitweb work with openSUSE /etc/mime.types, and it makes code simpler. > --- Signoff (i.e. Signed-off-by)? > gitweb/gitweb.perl | 9 +++------ > 1 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl > index 1b83a8d..d81d87b 100755 > --- a/gitweb/gitweb.perl > +++ b/gitweb/gitweb.perl > @@ -3560,12 +3560,9 @@ sub mimetype_guess_file { > open(my $mh, '<', $mimemap) or return undef; > while (<$mh>) { > next if m/^#/; # skip comments > - my ($mimetype, $exts) = split(/\t+/); > - if (defined $exts) { > - my @exts = split(/\s+/, $exts); > - foreach my $ext (@exts) { > - $mimemap{$ext} = $mimetype; > - } > + my ($mimetype, @exts) = split(/\s+/); > + foreach my $ext (@exts) { > + $mimemap{$ext} = $mimetype; > } > } > close($mh); > -- > 1.7.3.4 > -- Jakub Narebski Poland ShadeHawk on #git ``` ## J.H., 2011-06-14 19:30 Subject: Re: [PATCH] gitweb: allow space as delimiter in mime.types Message-ID: <4DF7B6EC.6010504@eaglescrag.net> URL: https://gitlist.dev/e/4DF7B6EC.6010504%40eaglescrag.net In-Reply-To: ``` On 06/14/2011 07:59 AM, Jakub Narebski wrote: > Ludwig Nussel writes: > >> Subject: [PATCH] gitweb: allow space as delimiter in mime.types > > A very minor nitpick: perhaps "work with" rather than "allow" would be > better? > >> in openSUSE /etc/mime.types has only spaces. I don't know if there's >> a canonical reference that says that only tabs are allowed. Mutt at >> least also accepts spaces. So make gitweb more liberal too. > > Ack. > > It is obviously correct, as names of MUME types cannot contain spaces, > it makes gitweb work with openSUSE /etc/mime.types, and it makes code > simpler. I agree with Jakub, Ack. - John 'Warthog9' Hawley ``` ## Junio C Hamano, 2011-06-14 21:28 Subject: Re: [PATCH] gitweb: allow space as delimiter in mime.types Message-ID: <7v62o8ksq5.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v62o8ksq5.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Jakub Narebski writes: > Ludwig Nussel writes: > >> Subject: [PATCH] gitweb: allow space as delimiter in mime.types > > A very minor nitpick: perhaps "work with" rather than "allow" would be > better? Allow is good; we earlier didn't allow space to be treated as delimiter, with this patch we will do. >> in openSUSE /etc/mime.types has only spaces. I don't know if there's >> a canonical reference that says that only tabs are allowed. Mutt at >> least also accepts spaces. So make gitweb more liberal too. > > Ack. > > It is obviously correct, as names of MUME types cannot contain spaces, > it makes gitweb work with openSUSE /etc/mime.types, and it makes code > simpler. > >> --- > > Signoff (i.e. Signed-off-by)? Yes, sign-off is missing and necessary. Thanks. ``` ## Ludwig Nussel, 2011-06-15 06:10 Subject: [PATCH v2] gitweb: allow space as delimiter in mime.types Message-ID: <1308118208-30845-1-git-send-email-ludwig.nussel@suse.de> URL: https://gitlist.dev/e/1308118208-30845-1-git-send-email-ludwig.nussel%40suse.de In-Reply-To: <7v62o8ksq5.fsf@alter.siamese.dyndns.org> ``` in openSUSE /etc/mime.types has only spaces. I don't know if there's a canonical reference that says that only tabs are allowed. Mutt at least also accepts spaces. So make gitweb more liberal too. Signed-off-by: Ludwig Nussel --- gitweb/gitweb.perl | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1b83a8d..d81d87b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3560,12 +3560,9 @@ sub mimetype_guess_file { open(my $mh, '<', $mimemap) or return undef; while (<$mh>) { next if m/^#/; # skip comments - my ($mimetype, $exts) = split(/\t+/); - if (defined $exts) { - my @exts = split(/\s+/, $exts); - foreach my $ext (@exts) { - $mimemap{$ext} = $mimetype; - } + my ($mimetype, @exts) = split(/\s+/); + foreach my $ext (@exts) { + $mimemap{$ext} = $mimetype; } } close($mh); -- 1.7.3.4 ```