diff options
| author | Damien Neil <dneil@google.com> | 2021-09-01 12:59:25 -0700 |
|---|---|---|
| committer | Cherry Mui <cherryyz@google.com> | 2021-09-02 14:13:09 +0000 |
| commit | 8226cb06aa44449a1b2f65dcfe87c4e9e2c45dbf (patch) | |
| tree | a96f31980a916f791334d810b046191fc7f11b26 /src/net | |
| parent | 6c480017ae600b2c90a264a922e041df04dfa785 (diff) | |
| download | go-8226cb06aa44449a1b2f65dcfe87c4e9e2c45dbf.tar.gz go-8226cb06aa44449a1b2f65dcfe87c4e9e2c45dbf.zip | |
[release-branch.go1.16] all: update golang.org/x/net to pull in CL 346890
For #47691.
Change-Id: I6650fdfc78786fc47a54167bf2f9061422bbb343
Reviewed-on: https://go-review.googlesource.com/c/go/+/347031
Trust: Damien Neil <dneil@google.com>
Run-TryBot: Damien Neil <dneil@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Diffstat (limited to 'src/net')
| -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 } |