lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-21 11:00:08 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge pull request #2376 from kmlebedev/S3MultipartUploadPassMime

Browse Source
This commit is contained in:
Chris Lu
2021-10-12 08:54:59 -07:00
committed by GitHub
parent de1ec050e8 458145425e
commit 7700bf62f0
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/s3api/filer_multipart.go
View File

@@ -38,6 +38,9 @@ func (s3a *S3ApiServer) createMultipartUpload(input *s3.CreateMultipartUploadInp
for k, v := range input.Metadata { for k, v := range input.Metadata {
entry.Extended[k] = []byte(*v) entry.Extended[k] = []byte(*v)
} }
if input.ContentType != nil {
entry.Attributes.Mime = *input.ContentType
}
}); err != nil { }); err != nil {
glog.Errorf("NewMultipartUpload error: %v", err) glog.Errorf("NewMultipartUpload error: %v", err)
return nil, s3err.ErrInternalError return nil, s3err.ErrInternalError
@@ -121,6 +124,9 @@ func (s3a *S3ApiServer) completeMultipartUpload(input *s3.CompleteMultipartUploa
entry.Extended[k] = v entry.Extended[k] = v
} }
} }
if pentry.Attributes.Mime != "" {
entry.Attributes.Mime = pentry.Attributes.Mime
}
}) })
if err != nil { if err != nil {

4
weed/s3api/s3api_object_multipart_handlers.go
View File

@@ -36,6 +36,10 @@ func (s3a *S3ApiServer) NewMultipartUploadHandler(w http.ResponseWriter, r *http
createMultipartUploadInput.Metadata[k] = aws.String(string(v)) createMultipartUploadInput.Metadata[k] = aws.String(string(v))
} }
contentType := r.Header.Get("Content-Type")
if contentType != "" {
createMultipartUploadInput.ContentType = &contentType
}
response, errCode := s3a.createMultipartUpload(createMultipartUploadInput) response, errCode := s3a.createMultipartUpload(createMultipartUploadInput)
glog.V(2).Info("NewMultipartUploadHandler", string(s3err.EncodeXMLResponse(response)), errCode) glog.V(2).Info("NewMultipartUploadHandler", string(s3err.EncodeXMLResponse(response)), errCode)