gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #2319 from lucas-clemente/fix-stream-open-request-cancelation

Browse Source 
use the HTTP request context when opening the request stream
This commit is contained in:
Marten Seemann
2020-01-29 00:08:43 +07:00
committed by GitHub
parent 84b0a01a2e d2209ba553
commit 2bac900862
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
http3/client.go
View File

@@ -2,7 +2,6 @@ package http3
import (
"bytes"
"context"
"crypto/tls"
"errors"
"fmt"
@@ -150,7 +149,7 @@ func (c *client) RoundTrip(req *http.Request) (*http.Response, error) {
return nil, c.handshakeErr
}
str, err := c.session.OpenStreamSync(context.Background())
str, err := c.session.OpenStreamSync(req.Context())
if err != nil {
return nil, err
}

4
http3/client_test.go
View File

@@ -301,7 +301,7 @@ var _ = Describe("Client", func() {
It("cancels a request while the request is still in flight", func() {
ctx, cancel := context.WithCancel(context.Background())
req := request.WithContext(ctx)
sess.EXPECT().OpenStreamSync(context.Background()).Return(str, nil)
sess.EXPECT().OpenStreamSync(ctx).Return(str, nil)
buf := &bytes.Buffer{}
str.EXPECT().Close().MaxTimes(1)
@@ -333,7 +333,7 @@ var _ = Describe("Client", func() {
ctx, cancel := context.WithCancel(context.Background())
req := request.WithContext(ctx)
sess.EXPECT().OpenStreamSync(context.Background()).Return(str, nil)
sess.EXPECT().OpenStreamSync(ctx).Return(str, nil)
buf := &bytes.Buffer{}
str.EXPECT().Close().MaxTimes(1)