From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 17 Jun 2006 16:07:24 +0000 (+0200)
Subject: gitweb: text files for 'blob_plain' action without charset by default
X-Git-Tag: v1.4.1-rc1~2^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad14e9317513f132293406e570f0b9360704371e;p=git.git

gitweb: text files for 'blob_plain' action without charset by default

$default_text_plain_charset is undefined (no specified charset) by
default. Additionally ':raw' layer for binmode is used for outputting file
content.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index b61b6ccbe..8fde1c883 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -47,7 +47,7 @@ my $projects_list =	"index/index.aux";
 
 # default blob_plain mimetype and default charset for text/plain blob
 my $default_blob_plain_mimetype = 'text/plain';
-my $default_text_plain_charset  = 'utf-8';	# can be undefined
+my $default_text_plain_charset  = undef;
 
 # input validation and dispatch
 my $action = $cgi->param('a');
@@ -1523,9 +1523,9 @@ sub git_blob_plain {
 
 	print $cgi->header(-type => "$type", '-content-disposition' => "inline; filename=\"$save_as\"");
 	undef $/;
-	binmode STDOUT, ':raw' unless $type =~ m/^text\//;
+	binmode STDOUT, ':raw';
 	print <$fd>;
-	binmode STDOUT, ':utf8' unless $type =~ m/^text\//;
+	binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
 	$/ = "\n";
 	close $fd;
 }