aboutsummaryrefslogtreecommitdiff
path: root/vendor/golang.org/x/net
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-12-09 08:37:22 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2020-12-09 08:37:22 -0500
commit228df27b5496098f8b06c3296517fd55471c9865 (patch)
tree4fc292d2b58ac9fd9669c3e40ed194aa6cadd333 /vendor/golang.org/x/net
parent247260081a5cdc4065009bcd1080c987974327e5 (diff)
downloadpodman-228df27b5496098f8b06c3296517fd55471c9865.tar.gz
podman-228df27b5496098f8b06c3296517fd55471c9865.tar.bz2
podman-228df27b5496098f8b06c3296517fd55471c9865.zip
Bump github.com/onsi/gomega from 1.10.3 to 1.10.4
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.3 to 1.10.4. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.10.3...v1.10.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/golang.org/x/net')
-rw-r--r--vendor/golang.org/x/net/http2/transport.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index 8b129b794..7688d72c3 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -2632,7 +2632,9 @@ func (t *Transport) getBodyWriterState(cs *clientStream, body io.Reader) (s body
func (s bodyWriterState) cancel() {
if s.timer != nil {
- s.timer.Stop()
+ if s.timer.Stop() {
+ s.resc <- nil
+ }
}
}