diff options
| author | chrislu <chris.lu@gmail.com> | 2022-10-24 16:50:41 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-10-24 16:50:41 -0700 |
| commit | 091f999e8c6cd586be363869df0046a8140e998c (patch) | |
| tree | d22f009ced5307ec78bda618682ec5d2204df654 /weed | |
| parent | 377870f4a93ea6d9d27cb2684bc22321ad788a6b (diff) | |
| parent | 131c70a7b48626ebbac88455e0c0a7a8f18fc66b (diff) | |
| download | seaweedfs-091f999e8c6cd586be363869df0046a8140e998c.tar.xz seaweedfs-091f999e8c6cd586be363869df0046a8140e998c.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 11 |
1 files 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 } } |