summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorJesús Espino <jespinog@gmail.com>2018-04-06 21:59:09 +0200
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-04-06 15:59:09 -0400
commitbe972fde28af33e074c51e22028f41d7e80920dd (patch)
treed69aae464c6b89080cfabdc022fa9bda01265bbc /vendor
parente16217166dd39fe75a9dc995c2d4e77cb7485143 (diff)
downloadchat-be972fde28af33e074c51e22028f41d7e80920dd.tar.gz
chat-be972fde28af33e074c51e22028f41d7e80920dd.tar.bz2
chat-be972fde28af33e074c51e22028f41d7e80920dd.zip
Adding minio-go for to the dependencies to temporary fix 2 minio-go bugs (#8577)
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/minio/minio-go/api-put-object-multipart.go14
-rw-r--r--vendor/github.com/minio/minio-go/api-put-object.go2
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