diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-04-10 11:29:03 +0200 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-04-10 11:29:03 +0200 |
| commit | 5856325c13ac8b9105a7ea6f674f0bf8a42fd0c1 (patch) | |
| tree | 5f3841176e2609ba0fb6e5a238b967ff454027c3 /vendor | |
| parent | 0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7 (diff) | |
| parent | ffa24fbcb21d210c90071b98a357d965e48eb67c (diff) | |
| download | chat-5856325c13ac8b9105a7ea6f674f0bf8a42fd0c1.tar.gz chat-5856325c13ac8b9105a7ea6f674f0bf8a42fd0c1.tar.bz2 chat-5856325c13ac8b9105a7ea6f674f0bf8a42fd0c1.zip | |
Merge remote-tracking branch 'origin/release-4.9' into merge-release-4.9
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/minio/minio-go/api-put-object-multipart.go | 14 | ||||
| -rw-r--r-- | vendor/github.com/minio/minio-go/api-put-object.go | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vendor/github.com/minio/minio-go/api-put-object-multipart.go b/vendor/github.com/minio/minio-go/api-put-object-multipart.go index f5b8893e6..5262e8b91 100644 --- a/vendor/github.com/minio/minio-go/api-put-object-multipart.go +++ b/vendor/github.com/minio/minio-go/api-put-object-multipart.go @@ -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, diff --git a/vendor/github.com/minio/minio-go/api-put-object.go b/vendor/github.com/minio/minio-go/api-put-object.go index 6d90eab74..ca4052225 100644 --- a/vendor/github.com/minio/minio-go/api-put-object.go +++ b/vendor/github.com/minio/minio-go/api-put-object.go @@ -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 |