[PATCH] Use perl builtin class utf8 for UTF-8 decoding
From: Ismail Dönmez <hidden>
Date: 2016-06-15 22:43:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Junio it would be very nice to get this in 1.5.4, fixes multiple problems and tested with many distros with success. Use perl builtin class utf8 for UTF-8 decoding, this fixes Encode problems with older Encode and avoids problems on UTF-8 locales. Signed-off-by: İsmail Dönmez <redacted> Acked-by: Jakub Narebski <redacted> Tested-by: Martin Koegler <redacted> Tested-by: Wincent Colaiuta <redacted>
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ff5daa7..db255c1 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -695,10 +695,9 @@ sub validate_refname { # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning sub to_utf8 { my $str = shift; - my $res; - eval { $res = decode_utf8($str, Encode::FB_CROAK); }; - if (defined $res) { - return $res; + if (utf8::valid($str)) { + utf8::decode($str); + return $str; } else { return decode($fallback_encoding, $str, Encode::FB_DEFAULT); }
--
Never learn by your mistakes, if you do you may never dare to try again.