summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-06 20:36:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-06 20:36:43 (GMT)
commitb15840e5b89719521c7b3fae1aa991e0efcb4a22 (patch)
tree69b57b6312f5ff90b3dbf35e30c173296aacba3f
parentcfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b (diff)
parentb13e3eacefc0fb6f4f89738f74ba5ef14437bed5 (diff)
downloadgit-b15840e5b89719521c7b3fae1aa991e0efcb4a22.zip
git-b15840e5b89719521c7b3fae1aa991e0efcb4a22.tar.gz
git-b15840e5b89719521c7b3fae1aa991e0efcb4a22.tar.bz2
Merge branch 'jn/maint-gitweb-utf8-fix' into maint
* jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str()
-rwxr-xr-xgitweb/gitweb.perl12
1 files changed, 8 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4f0c3bd..874023a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1442,8 +1442,8 @@ sub validate_refname {
sub to_utf8 {
my $str = shift;
return undef unless defined $str;
- if (utf8::valid($str)) {
- utf8::decode($str);
+
+ if (utf8::is_utf8($str) || utf8::decode($str)) {
return $str;
} else {
return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
@@ -1695,6 +1695,7 @@ sub chop_and_escape_str {
my ($str) = @_;
my $chopped = chop_str(@_);
+ $str = to_utf8($str);
if ($chopped eq $str) {
return esc_html($chopped);
} else {
@@ -6107,7 +6108,9 @@ sub git_blame_common {
-type=>"text/plain", -charset => "utf-8",
-status=> "200 OK");
local $| = 1; # output autoflush
- print while <$fd>;
+ while (my $line = <$fd>) {
+ print to_utf8($line);
+ }
close $fd
or print "ERROR $!\n";
@@ -7699,11 +7702,12 @@ sub git_opml {
-charset => 'utf-8',
-content_disposition => 'inline; filename="opml.xml"');
+ my $title = esc_html($site_name);
print <<XML;
<?xml version="1.0" encoding="utf-8"?>
<opml version="1.0">
<head>
- <title>$site_name OPML Export</title>
+ <title>$title OPML Export</title>
</head>
<body>
<outline text="git RSS feeds">