cleanup http client code
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Dec 2, 2015 at 20:53 UTC
cfb1a69184dd9a797c20d29f6e0bd857dd52eb1f
1 file changed
+7
-4
commands/http/client.go
+7
-4
@@ -79,10 +79,6 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
79
if req.Files() != nil {
80
fileReader = NewMultiFileReader(req.Files(), true)
81
reader = fileReader
82
- } else {
83
- // if we have no file data, use an empty Reader
84
- // (http.NewRequest panics when a nil Reader is used)
85
- reader = strings.NewReader("")
82
}
83
84
path := strings.Join(req.Path(), "/")
@@ -145,8 +141,15 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
141
}
142
143
func getQuery(req cmds.Request) (string, error) {
144
+ // some options should be kept clientside, the server doesnt care
145
+ skip := map[string]bool{
146
+ "api": true,
147
+ }
148
query := url.Values{}
149
for k, v := range req.Options() {
150
+ if skip[k] {
151
+ continue
152
+ }
153
str := fmt.Sprintf("%v", v)
154
query.Set(k, str)
155
}