fix: h2c fix

Author: morlay

example/cmd/example/main_test.go

@@ -37,8 +37,8 @@ func TestAll(t *testing.T) {
 	} {
 		t.Run(fmt.Sprintf("serve http/%d", 2-i), func(t *testing.T) {
 			c := &example.Client{
-				Endpoint:   srv.URL,
-				SupportH2C: i == 0,
+				Endpoint: srv.URL,
+				UseH2c:   i == 0,
 			}
 
 			ctx := c.InjectContext(context.Background())

pkg/courierhttp/client/client.go

@@ -50,8 +50,8 @@ func (h *httpTransportFunc) RoundTrip(request *http.Request) (*http.Response, er
 }
 
 type Client struct {
-	Endpoint   string `flag:""`
-	SupportH2C bool   `flag:",omitzero"`
+	Endpoint string `flag:""`
+	UseH2c   bool   `flag:",omitzero"`
 
 	NewError       func() error
 	HttpTransports []HttpTransport
@@ -79,8 +79,8 @@ func (c *Client) Do(ctx context.Context, req any, metas ...courier.Metadata) cou
 		httpClient.Transport = reasonableRoundTripper
 	}
 
-	if c.SupportH2C {
-		httpClient.Transport = UpgradeToSupportH2c(httpClient.Transport)
+	if c.UseH2c {
+		httpClient.Transport = convertTransportForH2c(httpClient.Transport)
 	}
 
 	httpClient.Transport = WithHttpTransports(c.HttpTransports...)(httpClient.Transport)

pkg/courierhttp/client/http_default.go

@@ -91,17 +91,16 @@ func GetShortConnClientContext(ctx context.Context, httpTransports ...HttpTransp
 	return &http.Client{Transport: WithHttpTransports(httpTransports...)(t)}
 }
 
-func UpgradeToSupportH2c(t http.RoundTripper) http.RoundTripper {
+func convertTransportForH2c(t http.RoundTripper) http.RoundTripper {
 	if t1, ok := t.(*http.Transport); ok {
 		if !t1.DisableKeepAlives {
-			if t2, err := http2.ConfigureTransports(t1); err == nil {
-				t2.AllowHTTP = true
-				t2.DialTLSContext = func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error) {
+			return &http2.Transport{
+				DialTLSContext: func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error) {
 					return t1.DialContext(ctx, network, addr)
-				}
-				t2.ConnPool = nil
-
-				return t2
+				},
+				IdleConnTimeout: t1.IdleConnTimeout,
+				ReadIdleTimeout: t1.ResponseHeaderTimeout,
+				AllowHTTP:       true,
 			}
 		}
 	}