Bump reva to latest main branch
For https://github.com/opencloud-eu/reva/pull/217
This commit is contained in:
+1
-1
@@ -5,4 +5,4 @@ package aws
|
||||
const SDKName = "aws-sdk-go"
|
||||
|
||||
// SDKVersion is the version of this SDK
|
||||
const SDKVersion = "1.55.6"
|
||||
const SDKVersion = "1.55.7"
|
||||
|
||||
+10
-2
@@ -290,13 +290,15 @@ type downloader struct {
|
||||
in *s3.GetObjectInput
|
||||
w io.WriterAt
|
||||
|
||||
wg sync.WaitGroup
|
||||
m sync.Mutex
|
||||
wg sync.WaitGroup
|
||||
m sync.Mutex
|
||||
once sync.Once
|
||||
|
||||
pos int64
|
||||
totalBytes int64
|
||||
written int64
|
||||
err error
|
||||
etag string
|
||||
|
||||
partBodyMaxRetries int
|
||||
}
|
||||
@@ -424,6 +426,9 @@ func (d *downloader) downloadChunk(chunk dlchunk) error {
|
||||
|
||||
// Get the next byte range of data
|
||||
in.Range = aws.String(chunk.ByteRange())
|
||||
if in.VersionId == nil && d.etag != "" {
|
||||
in.IfMatch = aws.String(d.etag)
|
||||
}
|
||||
|
||||
var n int64
|
||||
var err error
|
||||
@@ -466,6 +471,9 @@ func (d *downloader) tryDownloadChunk(in *s3.GetObjectInput, w io.Writer) (int64
|
||||
return 0, err
|
||||
}
|
||||
d.setTotalBytes(resp) // Set total if not yet set.
|
||||
d.once.Do(func() {
|
||||
d.etag = aws.StringValue(resp.ETag)
|
||||
})
|
||||
|
||||
var src io.Reader = resp.Body
|
||||
if d.cfg.BufferProvider != nil {
|
||||
|
||||
+13
-5
@@ -145,6 +145,19 @@ func (c *ConnWithReconnect) Modify(m *ldap.ModifyRequest) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// PasswordModify implements the ldap.Client interface
|
||||
func (c *ConnWithReconnect) PasswordModify(m *ldap.PasswordModifyRequest) (*ldap.PasswordModifyResult, error) {
|
||||
var err error
|
||||
var res *ldap.PasswordModifyResult
|
||||
|
||||
retryErr := c.retry(func(c ldap.Client) error {
|
||||
res, err = c.PasswordModify(m)
|
||||
return err
|
||||
})
|
||||
|
||||
return res, retryErr
|
||||
}
|
||||
|
||||
// ModifyDN implements the ldap.Client interface
|
||||
func (c *ConnWithReconnect) ModifyDN(m *ldap.ModifyDNRequest) error {
|
||||
err := c.retry(func(c ldap.Client) error {
|
||||
@@ -297,11 +310,6 @@ func (c *ConnWithReconnect) Compare(dn, attribute, value string) (bool, error) {
|
||||
return false, ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
|
||||
}
|
||||
|
||||
// PasswordModify implements the ldap.Client interface
|
||||
func (c *ConnWithReconnect) PasswordModify(*ldap.PasswordModifyRequest) (*ldap.PasswordModifyResult, error) {
|
||||
return nil, ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
|
||||
}
|
||||
|
||||
// SearchWithPaging implements the ldap.Client interface
|
||||
func (c *ConnWithReconnect) SearchWithPaging(searchRequest *ldap.SearchRequest, pagingSize uint32) (*ldap.SearchResult, error) {
|
||||
return nil, ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
|
||||
|
||||
Reference in New Issue
Block a user