From be972fde28af33e074c51e22028f41d7e80920dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 6 Apr 2018 21:59:09 +0200 Subject: Adding minio-go for to the dependencies to temporary fix 2 minio-go bugs (#8577) --- .../github.com/minio/minio-go/api-put-object-multipart.go | 14 +++++++------- vendor/github.com/minio/minio-go/api-put-object.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'vendor/github.com') 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 -- cgit v1.2.3-1-g7c22