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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jakub Narebski <jnareb@xxxxxxxxx> writes:

> 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.

Care to explain what that commenting out was about?

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

Are $project and $file always defined when we take this new
codepath?


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]