From 44637f03ccef3f005da41da5d1880df80cceebb2 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 27 Dec 2015 17:02:36 -0500 Subject: #2282 fast detection of utf-8 --- modules/template/template.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/template') diff --git a/modules/template/template.go b/modules/template/template.go index 4149de45..6c070b70 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -12,7 +12,6 @@ import ( "runtime" "strings" "time" - "unicode/utf8" "golang.org/x/net/html/charset" "golang.org/x/text/transform" @@ -131,11 +130,11 @@ func Sha1(str string) string { } func ToUtf8WithErr(content []byte) (error, string) { - if utf8.Valid(content[:1024]) { + charsetLabel := base.DetectEncoding(content) + if charsetLabel == "utf-8" { return nil, string(content) } - charsetLabel := base.DetectEncoding(content) encoding, _ := charset.Lookup(charsetLabel) if encoding == nil { return fmt.Errorf("Unknown encoding: %s", charsetLabel), string(content) -- cgit v1.2.3