diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-09-17 08:46:39 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-09-17 08:46:39 -0700 |
| commit | a0791d0ed4f147ef347e83f4aedc7ad03f1a2008 (patch) | |
| tree | 7b3526910798e4cff7a7200d684383046bac6225 /libgo/go/net | |
| parent | e252b51ccde010cbd2a146485d8045103cd99533 (diff) | |
| parent | 89be17a1b231ade643f28fbe616d53377e069da8 (diff) | |
| download | gcc-a0791d0ed4f147ef347e83f4aedc7ad03f1a2008.zip gcc-a0791d0ed4f147ef347e83f4aedc7ad03f1a2008.tar.gz gcc-a0791d0ed4f147ef347e83f4aedc7ad03f1a2008.tar.bz2 | |
Merge from trunk revision 89be17a1b231ade643f28fbe616d53377e069da8.
Diffstat (limited to 'libgo/go/net')
| -rw-r--r-- | libgo/go/net/http/h2_bundle.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libgo/go/net/http/h2_bundle.go b/libgo/go/net/http/h2_bundle.go index 0e5fbf8..8958a9e 100644 --- a/libgo/go/net/http/h2_bundle.go +++ b/libgo/go/net/http/h2_bundle.go @@ -4519,6 +4519,15 @@ func (sc *http2serverConn) serve() { case res := <-sc.wroteFrameCh: sc.wroteFrame(res) case res := <-sc.readFrameCh: + // Process any written frames before reading new frames from the client since a + // written frame could have triggered a new stream to be started. + if sc.writingFrameAsync { + select { + case wroteRes := <-sc.wroteFrameCh: + sc.wroteFrame(wroteRes) + default: + } + } if !sc.processFrameFromReader(res) { return } |