Browse Source
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.
pull/3902/head
Guo Lei
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
5 deletions
-
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 |
|
|
|
} |
|
|
|
} |
|
|
|