rdelaage
/
miniflux-v2
mirror of https://github.com/miniflux/v2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert feed encoding only if the charset is specified

This commit is contained in:
Frédéric Guillot 2017-11-21 22:55:19 -08:00
parent 855fb06bc9
commit 99dfbdbb47
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reader/http/response.go
View File

@ -4,8 +4,12 @@
package http
import "io"
import "golang.org/x/net/html/charset"
import (
"io"
"strings"
"golang.org/x/net/html/charset"
)
// Response wraps a server response.
type Response struct {
@ -41,5 +45,8 @@ func (r *Response) IsModified(etag, lastModified string) bool {
// NormalizeBodyEncoding make sure the body is encoded in UTF-8.
func (r *Response) NormalizeBodyEncoding() (io.Reader, error) {
return charset.NewReader(r.Body, r.ContentType)
if strings.Contains(r.ContentType, "charset=") {
return charset.NewReader(r.Body, r.ContentType)
}
return r.Body, nil
}