From 713b38e34c6d4a232af871659793bb9674e020f7 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 19 Jan 2018 22:42:55 -0800 Subject: Handle more encoding edge cases - Feeds with charset specified only in Content-Type header and not in XML document - Feeds with charset specified in both places - Feeds with charset specified only in XML document and not in HTTP header --- reader/rss/parser.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'reader/rss') diff --git a/reader/rss/parser.go b/reader/rss/parser.go index 0e9738a..f5de561 100644 --- a/reader/rss/parser.go +++ b/reader/rss/parser.go @@ -10,15 +10,14 @@ import ( "github.com/miniflux/miniflux/errors" "github.com/miniflux/miniflux/model" - - "golang.org/x/net/html/charset" + "github.com/miniflux/miniflux/reader/encoding" ) // Parse returns a normalized feed struct from a RSS feed. func Parse(data io.Reader) (*model.Feed, error) { feed := new(rssFeed) decoder := xml.NewDecoder(data) - decoder.CharsetReader = charset.NewReaderLabel + decoder.CharsetReader = encoding.CharsetReader err := decoder.Decode(feed) if err != nil { -- cgit v1.2.3