From 6a831ca015c746472589e9039b41d0fd6d4a9af0 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 4 Jun 2015 14:04:57 +0200 Subject: Godeps: update github.com/huin/goupnp to 5cff77a69fb22f5 This includes a fix adding a timeout to router discovery requests. --- Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Godeps/_workspace/src') diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go b/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go index 8cd20c2f4..7799a32ce 100644 --- a/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" "net/url" - + "time" "golang.org/x/net/html/charset" "github.com/huin/goupnp/httpu" @@ -64,7 +64,6 @@ func DiscoverDevices(searchTarget string) ([]MaybeRootDevice, error) { maybe := &results[i] loc, err := response.Location() if err != nil { - maybe.Err = ContextError{"unexpected bad location from search", err} continue } @@ -93,7 +92,11 @@ func DiscoverDevices(searchTarget string) ([]MaybeRootDevice, error) { } func requestXml(url string, defaultSpace string, doc interface{}) error { - resp, err := http.Get(url) + timeout := time.Duration(3 * time.Second) + client := http.Client{ + Timeout: timeout, + } + resp, err := client.Get(url) if err != nil { return err } -- cgit v1.2.3