Merge branch 'jn/mime-type-with-params'

* jn/mime-type-with-params: gitweb: Fix usability of $prevent_xss
git-mirror · Jun 6, 2011 · 2c6b5d8 · 2c6b5d8
2 parents eca4f3b + bee6ea1
commit 2c6b5d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -6127,7 +6127,7 @@ sub git_blob_plain {
 	# want to be sure not to break that by serving the image as an
 	# attachment (though Firefox 3 doesn't seem to care).
 	my $sandbox = $prevent_xss &&
-		$type !~ m!^(?:text/plain|image/(?:gif|png|jpeg))$!;
+		$type !~ m!^(?:text/plain|image/(?:gif|png|jpeg))(?:[ ;]|$)!;
 
 	print $cgi->header(
 		-type => $type,