highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-05 19:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling context cancellation during requests to S3

Browse Source
This commit is contained in:
DarthSim
2023-03-31 17:53:21 +03:00
parent 1a9768a2c6
commit 809346d47b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
transport/s3/s3.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
@@ -69,6 +70,12 @@ func (t transport) RoundTrip(req *http.Request) (resp *http.Response, err error)
s3req.HTTPResponse.Body.Close() s3req.HTTPResponse.Body.Close()
} }
if s3err, ok := err.(awserr.Error); ok && s3err.Code() == request.CanceledErrorCode {
if e := s3err.OrigErr(); e != nil {
return nil, e
}
}
if s3err, ok := err.(awserr.RequestFailure); !ok || s3err.StatusCode() < 100 || s3err.StatusCode() == 301 { if s3err, ok := err.(awserr.RequestFailure); !ok || s3err.StatusCode() < 100 || s3err.StatusCode() == 301 {
return nil, err return nil, err
} else { } else {