set logo output to raw mode

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index bf09b762f86623e276f1731c0119a914bc5f026f73c77b2207dda062d8ba18bf..e46e509a15f106b72e7ac0d4d03d480df2ede10da19d2ace2c500bf3e0fe9ac8 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -14,9 +14,10 @@ use CGI::Util qw(unescape);
 use CGI::Carp qw(fatalsToBrowser);
 use Encode;
 use Fcntl ':mode';
+binmode STDOUT, ':utf8';
 
 my $cgi = new CGI;
-my $version =          "250";
+my $version =          "253";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link =         "";
@@ -217,8 +218,8 @@ sub esc_url {
 
 sub esc_html {
        my $str = shift;
-       $str = escapeHTML($str);
        $str = decode("utf8", $str, Encode::FB_DEFAULT);
+       $str = escapeHTML($str);
        return $str;
 }
 
@@ -718,6 +719,7 @@ sub date_str {
 
 # git-logo (cached in browser for one day)
 sub git_logo {
+       binmode STDOUT, ':raw';
        print $cgi->header(-type => 'image/png', -expires => '+1d');
        # cat git-logo.png | hexdump -e '16/1 " %02x"  "\n"' | sed 's/ /\\x/g'
        print   "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52" .
@@ -1810,7 +1812,7 @@ sub git_commit {
                              $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, esc_html($from_file)) .
                              " with " . (int $similarity) . "% similarity$mode_chng]</span></td>\n" .
                              "<td class=\"link\">" .
-                             $cgi->a({-href => esc_uresc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob");
+                             $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob");
                        if ($to_id ne $from_id) {
                                print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file")}, "diff");
                        }