KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

fs/fshttp: fix --contimeout being ignored

Browse source 
The following command will block for 60s(default) when the network is slow or unavailable:

```
rclone  --contimeout 10s --low-level-retries 0 lsd dropbox:
```

This change will make it timeout after the expected 10s.

Signed-off-by: rkonfj <rkonfj@gmail.com>
This commit is contained in:
你知道未来吗 2023-11-25 01:53:33 +08:00 committed by GitHub
parent 4eed3ae99a
commit fd2322cb41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/fshttp/dialer.go
View file

@ -14,10 +14,6 @@ import (
"golang.org/x/net/ipv6" "golang.org/x/net/ipv6"
) )
func dialContext(ctx context.Context, network, address string, ci *fs.ConfigInfo) (net.Conn, error) {
return NewDialer(ctx).DialContext(ctx, network, address)
}
// Dialer structure contains default dialer and timeout, tclass support // Dialer structure contains default dialer and timeout, tclass support
type Dialer struct { type Dialer struct {
net.Dialer net.Dialer

4
fs/fshttp/http.go
View file

@ -91,8 +91,8 @@ func NewTransportCustom(ctx context.Context, customize func(*http.Transport)) ht
} }
t.DisableCompression = ci.NoGzip t.DisableCompression = ci.NoGzip
t.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) { t.DialContext = func(reqCtx context.Context, network, addr string) (net.Conn, error) {
return dialContext(ctx, network, addr, ci) return NewDialer(ctx).DialContext(reqCtx, network, addr)
} }
t.IdleConnTimeout = 60 * time.Second t.IdleConnTimeout = 60 * time.Second
t.ExpectContinueTimeout = ci.ExpectContinueTimeout t.ExpectContinueTimeout = ci.ExpectContinueTimeout