diff options
author | Frédéric Guillot <fred@miniflux.net> | 2018-01-19 22:42:55 -0800 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2018-01-20 13:25:21 -0800 |
commit | 713b38e34c6d4a232af871659793bb9674e020f7 (patch) | |
tree | 7f7797e140334d6ad69974cbce7e5f3746d31c6b /reader/opml | |
parent | 3b62f904d6d3fdad168d3b212ff7c465c01b50f4 (diff) |
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
Diffstat (limited to 'reader/opml')
-rw-r--r-- | reader/opml/parser.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reader/opml/parser.go b/reader/opml/parser.go index 8d61aa8..140acc5 100644 --- a/reader/opml/parser.go +++ b/reader/opml/parser.go @@ -9,14 +9,14 @@ import ( "io" "github.com/miniflux/miniflux/errors" - "golang.org/x/net/html/charset" + "github.com/miniflux/miniflux/reader/encoding" ) // Parse reads an OPML file and returns a SubcriptionList. func Parse(data io.Reader) (SubcriptionList, error) { feeds := new(opml) decoder := xml.NewDecoder(data) - decoder.CharsetReader = charset.NewReaderLabel + decoder.CharsetReader = encoding.CharsetReader err := decoder.Decode(feeds) if err != nil { |