Merge pull request #960 from fjl/nat-fixes

p2p/nat: fix UPnP auto discovery
2015-05-14 04:06:13 -07:00
parent c7a13c9be8 5f706cd7f5
commit 7fa740996c
142 changed files with 189479 additions and 25 deletions
--- a/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go
+++ b/Godeps/_workspace/src/github.com/huin/goupnp/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.NewReaderLabel

 	return decoder.Decode(doc)
 }