Skip to content

Add charset decoding support from net/html/charset #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chvish wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add charset decoding support from net/html/charset #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12844dd
use golang.org charset lib
chvish Jul 19, 2020
904177b
use reader from golang.org charset lib
chvish Jul 19, 2020
0f5c411
add charset decoding support
chvish Jul 19, 2020
a847d88
remove log line
chvish Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion xml/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
package xml

import (
"bytes"
"encoding/xml"
"fmt"
"io/ioutil"
"net/http"

"github.com/gorilla/rpc"
"golang.org/x/net/html/charset"
)

// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -43,7 +45,10 @@ func (c *Codec) NewRequest(r *http.Request) rpc.CodecRequest {
defer r.Body.Close()

var request ServerRequest
if err := xml.Unmarshal(rawxml, &request); err != nil {
d := xml.NewDecoder(bytes.NewReader(rawxml))
d.CharsetReader = charset.NewReaderLabel

if err := d.Decode(&request); err != nil {
return &CodecRequest{err: err}
}
request.rawxml = string(rawxml)
Expand Down
5 changes: 2 additions & 3 deletions xml/xml2rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import (
"unicode"
"unicode/utf8"

"github.com/rogpeppe/go-charset/charset"
_ "github.com/rogpeppe/go-charset/data"
"golang.org/x/net/html/charset"
)

// Types used for unmarshalling
Expand Down Expand Up @@ -52,7 +51,7 @@ func xml2RPC(xmlraw string, rpc interface{}) error {
// Unmarshal raw XML into the temporal structure
var ret response
decoder := xml.NewDecoder(bytes.NewReader([]byte(xmlraw)))
decoder.CharsetReader = charset.NewReader
decoder.CharsetReader = charset.NewReaderLabel
err := decoder.Decode(&ret)
if err != nil {
return FaultDecode
Expand Down