mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki 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
commit 2bac900862
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 ( import (
"bytes" "bytes"
"context"
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt" "fmt"
@ -150,7 +149,7 @@ func (c *client) RoundTrip(req *http.Request) (*http.Response, error) {
return nil, c.handshakeErr return nil, c.handshakeErr
} }
str, err := c.session.OpenStreamSync(context.Background()) str, err := c.session.OpenStreamSync(req.Context())
if err != nil { if err != nil {
return nil, err 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() { It("cancels a request while the request is still in flight", func() {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
req := request.WithContext(ctx) req := request.WithContext(ctx)
sess.EXPECT().OpenStreamSync(context.Background()).Return(str, nil) sess.EXPECT().OpenStreamSync(ctx).Return(str, nil)
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
str.EXPECT().Close().MaxTimes(1) str.EXPECT().Close().MaxTimes(1)
@ -333,7 +333,7 @@ var _ = Describe("Client", func() {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
req := request.WithContext(ctx) req := request.WithContext(ctx)
sess.EXPECT().OpenStreamSync(context.Background()).Return(str, nil) sess.EXPECT().OpenStreamSync(ctx).Return(str, nil)
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
str.EXPECT().Close().MaxTimes(1) str.EXPECT().Close().MaxTimes(1)