Merge pull request #161 from monzo/http2-negotiation-respect-context-deadline

joechrisellis · web-flow · commit b08f2318a450 · 2023-02-24T11:56:50.000Z
Use DialTLSContext instead of DialTLS when negotiating HTTP2 session
diff --git a/client.go b/client.go
@@ -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)
 		},
 	}
 )

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ var (`
`32`	`32`	`AllowHTTP: true,`
`33`	`33`	`// This monstrosity is needed to get the http2 Transport to dial over cleartext.`
`34`	`34`	`// See https://github.com/thrawn01/h2c-golang-example`
`35`		`- DialTLS: func(network, addr string, _ *tls.Config) (net.Conn, error) {`
`36`		`- return net.Dial(network, addr)`
	`35`	`+ DialTLSContext: func(ctx context.Context, network, addr string, _ *tls.Config) (net.Conn, error) {`
	`36`	`+ var d net.Dialer`
	`37`	`+ return d.DialContext(ctx, network, addr)`
`37`	`38`	`},`
`38`	`39`	`}`
`39`	`40`	`)`