Re: [PATCH] gitweb: Make $prevent_xss protection for 'blob_plain' more usable

From: Jakub Narebski <jnareb@gmail.com>
Date: Jun 13, 2011, 21:49 UTC
Message-ID: <201106132350.00161.jnareb@gmail.com>
In-Reply-To: <7v8vt5ptj4.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 15 quoted lines

> Jakub Narebski <jnareb@gmail.com> writes:
> 
> > +	# serve text/* as text/plain
> > +	if ($prevent_xss &&
> > +	    $type =~ m!^text/([a-z]+)\b(.*)$!) {
> > +		my ($subtype, $rest) = ($1, $2);
> > +		$rest = defined $rest ? $rest : '';
> > +		$type = "text/plain$rest" if ($subtype ne 'plain');
> 
> Hmph, wouldn't it be more straightforward if you dropped the statement
> modifier?  I.e.
> 
> 	my ($subtype, $rest) = ($1, $2);
> 	$rest = '' unless defined $rest;
> 	$type = "text/plain$rest";

Yes, of course.

I don't know why I decided that avoiding rewriting 'text/plain; 
charset=utf-8' case was important.  It cretainly is not worth making 
code harder to follow.
 
Can you fix it during applying, or should I resend it?

> Other than that, looks good to me.

Thanks.

-- 
Jakub Narebski
Poland