diff options
| author | Heschi Kreinick <heschi@google.com> | 2021-10-07 19:02:56 -0400 |
|---|---|---|
| committer | Heschi Kreinick <heschi@google.com> | 2021-10-07 19:02:56 -0400 |
| commit | 35d5cd0dcfb9d06064ec37da1621d24676454058 (patch) | |
| tree | 5319064d4c2970a6d3be069b9c2a0e273f0f14dd /src/net/http/h2_bundle.go | |
| parent | 0d02a0d966b6d307ac33e3df3687948b74408569 (diff) | |
| parent | c580180744e60d6c84fc0b59d634fcff01290780 (diff) | |
| download | go-35d5cd0dcfb9d06064ec37da1621d24676454058.tar.gz go-35d5cd0dcfb9d06064ec37da1621d24676454058.zip | |
[dev.boringcrypto.go1.16] all: merge go1.16.9 into dev.boringcrypto.go1.16
Change-Id: Ic26e9802fe13c491fcc26f34b8847779ac43cfe2
Diffstat (limited to 'src/net/http/h2_bundle.go')
| -rw-r--r-- | src/net/http/h2_bundle.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 6bef310feb..22f1e78498 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -4435,6 +4435,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 } |