diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-09 15:00:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 15:00:37 -0500 |
| commit | 43567c6539e2eb2d574f3d63afbf2a7ac0394309 (patch) | |
| tree | 06b6ff78e0f5208f5cb1a64919b61461079e8cbc /vendor/golang.org | |
| parent | 6db3e9bfeb39e26bf6c211328c77bd847ff140f5 (diff) | |
| parent | 228df27b5496098f8b06c3296517fd55471c9865 (diff) | |
| download | podman-43567c6539e2eb2d574f3d63afbf2a7ac0394309.tar.gz podman-43567c6539e2eb2d574f3d63afbf2a7ac0394309.tar.bz2 podman-43567c6539e2eb2d574f3d63afbf2a7ac0394309.zip | |
Merge pull request #8657 from containers/dependabot/go_modules/github.com/onsi/gomega-1.10.4
Bump github.com/onsi/gomega from 1.10.3 to 1.10.4
Diffstat (limited to 'vendor/golang.org')
| -rw-r--r-- | vendor/golang.org/x/net/http2/transport.go | 4 |
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 + } } } |