server/http: Fixed error when using long encoding option name

75647423 · Matt Bell · Juan Batiz-Benet · 3d0ca14b · 75647423
Commit 75647423 authored Oct 22, 2014 by Matt Bell Committed by Juan Batiz-Benet Nov 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

server/http/http.go server/http/http.go +3 -1

No files found.
--- a/server/http/http.go
+++ b/server/http/http.go
@@ -148,7 +148,9 @@ func getOptions(r *http.Request) map[string]interface{} {

 	// TODO: get more options from request body (formdata, json, etc)

-	if _, exists := opts[cmds.EncShort]; !exists {
+	_, short := opts[cmds.EncShort]
+	_, long := opts[cmds.EncLong]
+	if !short && !long {
 		opts[cmds.EncShort] = cmds.JSON
 	}