From 76bda0d8f103741a3afa849dff09968991cce0a1 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 22 Mar 2016 17:54:31 -0700 Subject: [PATCH] routers: Fix order of PostPolicyHandlers and headers. --- bucket-handlers.go | 3 +-- routers.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bucket-handlers.go b/bucket-handlers.go index 210c6f60c..365667812 100644 --- a/bucket-handlers.go +++ b/bucket-handlers.go @@ -518,8 +518,7 @@ func extractHTTPFormValues(reader *multipart.Reader) (io.Reader, map[string]stri // signature policy in multipart/form-data func (api storageAPI) PostPolicyBucketHandler(w http.ResponseWriter, r *http.Request) { // Here the parameter is the size of the form data that should - // be loaded in memory, the remaining being put in temporary - // files + // be loaded in memory, the remaining being put in temporary files. reader, e := r.MultipartReader() if e != nil { errorIf(probe.NewError(e), "Unable to initialize multipart reader.", nil) diff --git a/routers.go b/routers.go index a36b5995c..70c5cd0a6 100644 --- a/routers.go +++ b/routers.go @@ -149,10 +149,10 @@ func registerAPIHandlers(mux *router.Router, a storageAPI, w *webAPI) { bucket.Methods("PUT").HandlerFunc(a.PutBucketHandler) // HeadBucket bucket.Methods("HEAD").HandlerFunc(a.HeadBucketHandler) + // PostPolicy + bucket.Methods("POST").HeadersRegexp("Content-Type", "multipart/form-data*").HandlerFunc(a.PostPolicyBucketHandler) // DeleteMultipleObjects bucket.Methods("POST").HandlerFunc(a.DeleteMultipleObjectsHandler) - // PostPolicy - bucket.Methods("POST").Headers("Content-Type", "multipart/form-data").HandlerFunc(a.PostPolicyBucketHandler) // DeleteBucketPolicy bucket.Methods("DELETE").HandlerFunc(a.DeleteBucketPolicyHandler).Queries("policy", "") // DeleteBucket