mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #22804 from ncdc/bump-spdystream
Auto commit by PR queue bot
This commit is contained in:
commit
5e50302a55
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@ -399,7 +399,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/docker/spdystream",
|
"ImportPath": "github.com/docker/spdystream",
|
||||||
"Rev": "106e140db2cb50923efe088bf2906b2ee5a45fec"
|
"Rev": "449fdfce4d962303d702fec724ef0ad181c92528"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/elazarl/go-bindata-assetfs",
|
"ImportPath": "github.com/elazarl/go-bindata-assetfs",
|
||||||
|
9
Godeps/_workspace/src/github.com/docker/spdystream/stream.go
generated
vendored
9
Godeps/_workspace/src/github.com/docker/spdystream/stream.go
generated
vendored
@ -170,6 +170,11 @@ func (s *Stream) Reset() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Stream) resetStream() error {
|
func (s *Stream) resetStream() error {
|
||||||
|
// Always call closeRemoteChannels, even if s.finished is already true.
|
||||||
|
// This makes it so that stream.Close() followed by stream.Reset() allows
|
||||||
|
// stream.Read() to unblock.
|
||||||
|
s.closeRemoteChannels()
|
||||||
|
|
||||||
s.finishLock.Lock()
|
s.finishLock.Lock()
|
||||||
if s.finished {
|
if s.finished {
|
||||||
s.finishLock.Unlock()
|
s.finishLock.Unlock()
|
||||||
@ -178,8 +183,6 @@ func (s *Stream) resetStream() error {
|
|||||||
s.finished = true
|
s.finished = true
|
||||||
s.finishLock.Unlock()
|
s.finishLock.Unlock()
|
||||||
|
|
||||||
s.closeRemoteChannels()
|
|
||||||
|
|
||||||
resetFrame := &spdy.RstStreamFrame{
|
resetFrame := &spdy.RstStreamFrame{
|
||||||
StreamId: s.streamId,
|
StreamId: s.streamId,
|
||||||
Status: spdy.Cancel,
|
Status: spdy.Cancel,
|
||||||
@ -320,7 +323,5 @@ func (s *Stream) closeRemoteChannels() {
|
|||||||
case <-s.closeChan:
|
case <-s.closeChan:
|
||||||
default:
|
default:
|
||||||
close(s.closeChan)
|
close(s.closeChan)
|
||||||
s.dataLock.Lock()
|
|
||||||
defer s.dataLock.Unlock()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user