diff options
author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-03-18 09:17:39 +0000 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2020-03-25 14:20:34 +0100 |
commit | e8e590ed88b26e0ffc554862a284b23fc8c9bdf3 (patch) | |
tree | 5ca8d35e46da42d4c958841303ffc79c8cb4e3be /vendor/golang.org/x/net/http2/pipe.go | |
parent | 69b011d3ac39b985cdbd2bacfa1eaeba166bf224 (diff) | |
download | podman-e8e590ed88b26e0ffc554862a284b23fc8c9bdf3.tar.gz podman-e8e590ed88b26e0ffc554862a284b23fc8c9bdf3.tar.bz2 podman-e8e590ed88b26e0ffc554862a284b23fc8c9bdf3.zip |
Bump github.com/rootless-containers/rootlesskit from 0.8.0 to 0.9.2
Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.8.0 to 0.9.2.
- [Release notes](https://github.com/rootless-containers/rootlesskit/releases)
- [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.8.0...v0.9.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'vendor/golang.org/x/net/http2/pipe.go')
-rw-r--r-- | vendor/golang.org/x/net/http2/pipe.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go index a6140099c..2a5399ec4 100644 --- a/vendor/golang.org/x/net/http2/pipe.go +++ b/vendor/golang.org/x/net/http2/pipe.go @@ -17,6 +17,7 @@ type pipe struct { mu sync.Mutex c sync.Cond // c.L lazily initialized to &p.mu b pipeBuffer // nil when done reading + unread int // bytes unread when done err error // read error once empty. non-nil means closed. breakErr error // immediate read error (caller doesn't see rest of b) donec chan struct{} // closed on error @@ -33,7 +34,7 @@ func (p *pipe) Len() int { p.mu.Lock() defer p.mu.Unlock() if p.b == nil { - return 0 + return p.unread } return p.b.Len() } @@ -80,6 +81,7 @@ func (p *pipe) Write(d []byte) (n int, err error) { return 0, errClosedPipeWrite } if p.breakErr != nil { + p.unread += len(d) return len(d), nil // discard when there is no reader } return p.b.Write(d) @@ -117,6 +119,9 @@ func (p *pipe) closeWithError(dst *error, err error, fn func()) { } p.readFn = fn if dst == &p.breakErr { + if p.b != nil { + p.unread += p.b.Len() + } p.b = nil } *dst = err |