From 97edb40275d68f659707207fddc97a920e3f9b63 Mon Sep 17 00:00:00 2001 From: Guo Lei Date: Tue, 25 Oct 2022 00:25:48 +0800 Subject: [PATCH] Fix errinfo (#3893) * types packages is imported more than onece * Fix error response when format of --expires is wrong. It MUST be in RFC 1123 date format. --- weed/s3api/s3api_object_handlers.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 2fc0111a4..8c4e3f0e8 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -6,16 +6,17 @@ import ( "encoding/json" "encoding/xml" "fmt" - "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" - "github.com/seaweedfs/seaweedfs/weed/security" - "github.com/seaweedfs/seaweedfs/weed/util/mem" - "golang.org/x/exp/slices" "io" "net/http" "net/url" "strings" "time" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/security" + "github.com/seaweedfs/seaweedfs/weed/util/mem" + "golang.org/x/exp/slices" + "github.com/pquerna/cachecontrol/cacheobject" "github.com/seaweedfs/seaweedfs/weed/filer" @@ -63,7 +64,7 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) if r.Header.Get("Expires") != "" { if _, err = time.Parse(http.TimeFormat, r.Header.Get("Expires")); err != nil { - s3err.WriteErrorResponse(w, r, s3err.ErrMalformedExpires) + s3err.WriteErrorResponse(w, r, s3err.ErrMalformedDate) return } }