Skip to content

Commit

Permalink
Merge pull request #161 from monzo/http2-negotiation-respect-context-…
Browse files Browse the repository at this point in the history
…deadline

Use DialTLSContext instead of DialTLS when negotiating HTTP2 session
  • Loading branch information
joechrisellis authored Feb 24, 2023
2 parents 8168923 + dd1c028 commit b08f231
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ var (
AllowHTTP: true,
// This monstrosity is needed to get the http2 Transport to dial over cleartext.
// See https://github.com/thrawn01/h2c-golang-example
DialTLS: func(network, addr string, _ *tls.Config) (net.Conn, error) {
return net.Dial(network, addr)
DialTLSContext: func(ctx context.Context, network, addr string, _ *tls.Config) (net.Conn, error) {
var d net.Dialer
return d.DialContext(ctx, network, addr)
},
}
)
Expand Down

0 comments on commit b08f231

Please sign in to comment.