From: Jakub Narebski Date: Mon, 1 Dec 2008 18:01:42 +0000 (+0100) Subject: gitweb: Fix handling of non-ASCII characters in inserted HTML files X-Git-Tag: v1.6.1-rc2~11^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dcb5e1ac87330b20962af9199a345eb378d3705;p=git.git gitweb: Fix handling of non-ASCII characters in inserted HTML files Use new insert_file() subroutine to insert HTML chunks from external files: $site_header, $home_text (by default indextext.html), $site_footer, and $projectroot/$project/REAME.html. All non-ASCII chars of those files will be broken by Perl IO layer without decoding to utf8, so insert_file() does to_utf8() on each printed line; alternate solution would be to open those files with "binmode $fh, ':utf8'", or even all files with "use open qw(:std :utf8)". Note that inserting README.html lost one of checks for simplicity. Noticed-by: Tatsuki Sugiura Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 933e13738..b92134b1c 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2740,6 +2740,15 @@ sub get_file_owner { return to_utf8($owner); } +# assume that file exists +sub insert_file { + my $filename = shift; + + open my $fd, '<', $filename; + print map(to_utf8, <$fd>); + close $fd; +} + ## ...................................................................... ## mimetype related functions @@ -2928,9 +2937,7 @@ EOF "\n"; if (-f $site_header) { - open (my $fd, $site_header); - print <$fd>; - close $fd; + insert_file($site_header); } print "

\n" . @@ -3017,9 +3024,7 @@ sub git_footer_html { print "

\n"; # class="page_footer" if (-f $site_footer) { - open (my $fd, $site_footer); - print <$fd>; - close $fd; + insert_file($site_footer); } print "\n" . @@ -4358,9 +4363,7 @@ sub git_project_list { git_header_html(); if (-f $home_text) { print "

\n"; - open (my $fd, $home_text); - print <$fd>; - close $fd; + insert_file($home_text); print "

\n"; } print $cgi->startform(-method => "get") . @@ -4472,13 +4475,10 @@ sub git_summary { print "\n"; if (-s "$projectroot/$project/README.html") { - if (open my $fd, "$projectroot/$project/README.html") { - print "

readme

\n" . - "

\n"; - print $_ while (<$fd>); - print "\n

\n"; # class="readme" - close $fd; - } + print "

readme

\n" . + "

\n"; + insert_file("$projectroot/$project/README.html"); + print "\n

\n"; # class="readme" } # we need to request one more than 16 (0..15) to check if