Merge pull request #3123 from thaJeztah/update_spdy

vendor: github.com/moby/spdystream v0.5.0 (indirect)
This commit is contained in:
CrazyMax 2025-04-17 16:25:49 +02:00 committed by GitHub
commit cd38da0244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 7 deletions

2
go.mod
View File

@ -132,7 +132,7 @@ require (
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect

4
go.sum
View File

@ -289,8 +289,8 @@ github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8=
github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=

View File

@ -712,7 +712,9 @@ func (s *Connection) shutdown(closeTimeout time.Duration) {
var timeout <-chan time.Time
if closeTimeout > time.Duration(0) {
timeout = time.After(closeTimeout)
timer := time.NewTimer(closeTimeout)
defer timer.Stop()
timeout = timer.C
}
streamsClosed := make(chan bool)
@ -739,7 +741,15 @@ func (s *Connection) shutdown(closeTimeout time.Duration) {
}
if err != nil {
duration := 10 * time.Minute
// default to 1 second
duration := time.Second
// if a closeTimeout was given, use that, clipped to 1s-10m
if closeTimeout > time.Second {
duration = closeTimeout
}
if duration > 10*time.Minute {
duration = 10 * time.Minute
}
timer := time.NewTimer(duration)
defer timer.Stop()
select {
@ -806,7 +816,9 @@ func (s *Connection) CloseWait() error {
func (s *Connection) Wait(waitTimeout time.Duration) error {
var timeout <-chan time.Time
if waitTimeout > time.Duration(0) {
timeout = time.After(waitTimeout)
timer := time.NewTimer(waitTimeout)
defer timer.Stop()
timeout = timer.C
}
select {

2
vendor/modules.txt vendored
View File

@ -578,7 +578,7 @@ github.com/moby/locker
## explicit; go 1.19
github.com/moby/patternmatcher
github.com/moby/patternmatcher/ignorefile
# github.com/moby/spdystream v0.4.0
# github.com/moby/spdystream v0.5.0
## explicit; go 1.13
github.com/moby/spdystream
github.com/moby/spdystream/spdy