Merge branch 'thinxer-master'

2015-03-07 08:50:21 +00:00
parent 4191d8a850 4566387de9
commit 2ed6e64917
1 changed files with 3 additions and 0 deletions
--- a/goupnp.go
+++ b/goupnp.go
@@ -20,6 +20,8 @@ import (
 	"net/http"
 	"net/url"

+	"golang.org/x/net/html/charset"
+
 	"github.com/huin/goupnp/httpu"
 	"github.com/huin/goupnp/ssdp"
 )
@@ -104,6 +106,7 @@ func requestXml(url string, defaultSpace string, doc interface{}) error {

 	decoder := xml.NewDecoder(resp.Body)
 	decoder.DefaultSpace = defaultSpace
+	decoder.CharsetReader = charset.NewReaderByName

 	return decoder.Decode(doc)
 }