IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-4.9' into merge-release-4.9

Browse Source
This commit is contained in:
Jesús Espino
2018-04-10 11:29:03 +02:00
parent 0a6b96cb40 ffa24fbcb2
commit 5856325c13
7 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vendor/github.com/minio/minio-go/api-put-object-multipart.go generated vendored
View File

@@ -260,13 +260,13 @@ func (c Client) uploadPart(ctx context.Context, bucketName, objectName, uploadID
// Set encryption headers, if any.
customHeader := make(http.Header)
for k, v := range metadata {
if len(v) > 0 {
if strings.HasPrefix(strings.ToLower(k), serverEncryptionKeyPrefix) {
customHeader.Set(k, v)
}
}
}
// for k, v := range metadata {
// if len(v) > 0 {
// if strings.HasPrefix(strings.ToLower(k), serverEncryptionKeyPrefix) {
// customHeader.Set(k, v)
// }
// }
// }
reqMetadata := requestMetadata{
bucketName: bucketName,

2
vendor/github.com/minio/minio-go/api-put-object.go generated vendored
View File

@@ -207,7 +207,7 @@ func (c Client) putObjectMultipartStreamNoLength(ctx context.Context, bucketName
if rErr == io.EOF && partNumber > 1 {
break
}
if rErr != nil && rErr != io.ErrUnexpectedEOF {
if rErr != nil && rErr != io.ErrUnexpectedEOF && rErr != io.EOF {
return 0, rErr
}
// Update progress reader appropriately to the latest offset