From dae8193bd49f9c52b96a5a93deda0f7c7853c410 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 7 Jan 2018 20:47:48 -0800 Subject: [PATCH] Remove duplicate http constants (#5367) --- cmd/auth-handler.go | 5 +++-- cmd/generic-handlers.go | 24 +++++++----------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/cmd/auth-handler.go b/cmd/auth-handler.go index a042942e1..52db08918 100644 --- a/cmd/auth-handler.go +++ b/cmd/auth-handler.go @@ -58,13 +58,14 @@ func isRequestPresignedSignatureV2(r *http.Request) bool { // Verify if request has AWS Post policy Signature Version '4'. func isRequestPostPolicySignatureV4(r *http.Request) bool { - return strings.Contains(r.Header.Get("Content-Type"), "multipart/form-data") && r.Method == httpPOST + return strings.Contains(r.Header.Get("Content-Type"), "multipart/form-data") && + r.Method == http.MethodPost } // Verify if the request has AWS Streaming Signature Version '4'. This is only valid for 'PUT' operation. func isRequestSignStreamingV4(r *http.Request) bool { return r.Header.Get("x-amz-content-sha256") == streamingContentSHA256 && - r.Method == httpPUT + r.Method == http.MethodPut } // Authorization type. diff --git a/cmd/generic-handlers.go b/cmd/generic-handlers.go index b68a664cd..b08df3646 100644 --- a/cmd/generic-handlers.go +++ b/cmd/generic-handlers.go @@ -229,7 +229,7 @@ func setBrowserCacheControlHandler(h http.Handler) http.Handler { } func (h cacheControlHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method == httpGET && guessIsBrowserReq(r) && globalIsBrowserEnabled { + if r.Method == http.MethodGet && guessIsBrowserReq(r) && globalIsBrowserEnabled { // For all browser requests set appropriate Cache-Control policies if hasPrefix(r.URL.Path, minioReservedBucketPath+"/") { if hasSuffix(r.URL.Path, ".js") || r.URL.Path == minioReservedBucketPath+"/favicon.ico" { @@ -341,24 +341,14 @@ type resourceHandler struct { handler http.Handler } -// List of http methods. -const ( - httpGET = "GET" - httpPUT = "PUT" - httpHEAD = "HEAD" - httpPOST = "POST" - httpDELETE = "DELETE" - httpOPTIONS = "OPTIONS" -) - // List of default allowable HTTP methods. var defaultAllowableHTTPMethods = []string{ - httpGET, - httpPUT, - httpHEAD, - httpPOST, - httpDELETE, - httpOPTIONS, + http.MethodGet, + http.MethodPut, + http.MethodHead, + http.MethodPost, + http.MethodDelete, + http.MethodOptions, } // setCorsHandler handler for CORS (Cross Origin Resource Sharing)