opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves return on goaway to ensure header decoding

Browse Source
This commit is contained in:
Gian Biondi
2015-04-30 12:18:09 -04:00
parent dbe74dd6c5
commit 6fa6f0b130
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
transport/http2_server.go
View File

@ -146,10 +146,6 @@ func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame header
hDec.state = decodeState{} hDec.state = decodeState{}
} }
}() }()
if t.goaway {
//Stop creating streams on this transport
return nil
}
endHeaders, err := hDec.decodeServerHTTP2Headers(frame) endHeaders, err := hDec.decodeServerHTTP2Headers(frame)
if s == nil { if s == nil {
// s has been closed. // s has been closed.
@ -169,6 +165,10 @@ func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame header
if !endHeaders { if !endHeaders {
return s return s
} }
if t.goaway {
//Stop creating streams on this transport
return nil
}
t.mu.Lock() t.mu.Lock()
if t.state != reachable { if t.state != reachable {
t.mu.Unlock() t.mu.Unlock()
@ -413,13 +413,6 @@ func (t *http2Server) handleGoAway(f *http2.GoAwayFrame) {
t.mu.Lock() t.mu.Lock()
t.goaway = true t.goaway = true
t.mu.Unlock() t.mu.Unlock()
for id, _ := range t.activeStreams {
if id > f.LastStreamID {
if s, ok := t.activeStreams[f.LastStreamID]; ok {
t.closeStream(s)
}
}
}
} }
func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error { func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error {