threads / patch / 27623

patchgitweb: allow space as delimiter in mime.types

Subject: [PATCH] gitweb: allow space as delimiter in mime.types

## tl;dr

5 messages between Jun 14, 2011 and Jun 15, 2011. Diffs are folded; open one to read it.

replies: 4people: 4as markdown or json

Ludwig Nussel· Jun 14, 2011, 14:09 UTC · lore

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(-)

Show changes to gitweb/gitweb.perl +3 −6

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· Jun 14, 2011, 14:59 UTC · re: Ludwig Nussel · lore

Re: [PATCH] gitweb: allow space as delimiter in mime.types

Ludwig Nussel <ludwig.nussel@suse.de> 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)?

Show 26 quoted lines

>  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.· Jun 14, 2011, 19:30 UTC · re: Jakub Narebski · lore

Re: [PATCH] gitweb: allow space as delimiter in mime.types

On 06/14/2011 07:59 AM, Jakub Narebski wrote:

Show 16 quoted lines

> Ludwig Nussel <ludwig.nussel@suse.de> 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· Jun 14, 2011, 21:28 UTC · re: Jakub Narebski · lore

Re: [PATCH] gitweb: allow space as delimiter in mime.types

Jakub Narebski <jnareb@gmail.com> writes:

Show 6 quoted lines

> Ludwig Nussel <ludwig.nussel@suse.de> 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.

Show 13 quoted lines

>> 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· Jun 15, 2011, 06:10 UTC · re: Junio C Hamano · lore

[PATCH v2] gitweb: allow space as delimiter in mime.types

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 <ludwig.nussel@suse.de>
---
 gitweb/gitweb.perl |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Show changes to gitweb/gitweb.perl +3 −6

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