test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-12-02 20:28:17 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

!1 修复gxml中当encoding为空时的报错

Browse Source 
Merge pull request !1 from 蚊子/master
This commit is contained in:
蚊子 2018-07-04 12:46:39 +08:00 committed by John
commit 4255417cc3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g/encoding/gxml/gxml.go
View File

@ -62,9 +62,14 @@ func prepare(xmlbyte []byte) error {
return err return err
} }
charset := mahonia.GetCharset(matchStr[1]) xmlEncode := "UTF-8"
if len(matchStr) == 2 {
xmlEncode = matchStr[1]
}
charset := mahonia.GetCharset(xmlEncode)
if charset == nil { if charset == nil {
return errors.New(fmt.Sprintf("not support charset:%s", matchStr[1])) return errors.New(fmt.Sprintf("not support charset:%s", xmlEncode))
} }
if !strings.EqualFold(charset.Name, "UTF-8") { if !strings.EqualFold(charset.Name, "UTF-8") {