diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-14 19:06:13 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-14 19:06:13 +0800 |
| commit | 7fa740996cf01b56a734e579fcfcd9c2e8585ac5 (patch) | |
| tree | 23a9fcf8248a12570e67155c21263f50df014f39 /Godeps/_workspace/src/github.com | |
| parent | c7a13c9be86417848582a2ab6704586f92dff27c (diff) | |
| parent | 5f706cd7f5a97b3354b23de4273009f08586ff04 (diff) | |
| download | dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar.gz dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar.bz2 dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar.lz dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar.xz dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.tar.zst dexon-7fa740996cf01b56a734e579fcfcd9c2e8585ac5.zip | |
Merge pull request #960 from fjl/nat-fixes
p2p/nat: fix UPnP auto discovery
Diffstat (limited to 'Godeps/_workspace/src/github.com')
| -rw-r--r-- | Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go b/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go index 120b92444..8cd20c2f4 100644 --- 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) } |