From 8c390f098725672c4ae90c942742e01b9d2de43e Mon Sep 17 00:00:00 2001 From: David Calavera Date: Wed, 23 Mar 2016 15:05:19 -0400 Subject: [PATCH] Vendor engine-api 0.3.1. Signed-off-by: David Calavera (cherry picked from commit 58385bc8a51e538f64a0d91c3259f20c6c289c86) --- hack/vendor.sh | 2 +- .../src/github.com/docker/engine-api/client/client.go | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index dfb76edad5..c94d38ed71 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -24,7 +24,7 @@ clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://gith clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 clone git github.com/docker/go-connections v0.2.0 -clone git github.com/docker/engine-api v0.3.0 +clone git github.com/docker/engine-api v0.3.1 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 clone git github.com/imdario/mergo 0.2.1 diff --git a/vendor/src/github.com/docker/engine-api/client/client.go b/vendor/src/github.com/docker/engine-api/client/client.go index 13aecc1be7..0716667b3a 100644 --- a/vendor/src/github.com/docker/engine-api/client/client.go +++ b/vendor/src/github.com/docker/engine-api/client/client.go @@ -97,10 +97,14 @@ func (cli *Client) getAPIPath(p string, query url.Values) string { } else { apiPath = fmt.Sprintf("%s%s", cli.basePath, p) } - if len(query) > 0 { - apiPath += "?" + query.Encode() + + u := &url.URL{ + Path: apiPath, } - return apiPath + if len(query) > 0 { + u.RawQuery = query.Encode() + } + return u.String() } // ClientVersion returns the version string associated with this