From 5999fcf7db840d57c91b3b16a711ab0cee31e92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Fri, 19 Apr 2024 01:07:15 +0900
Subject: [PATCH] fix: check nil tls conn

---
 http/http.go   | 6 ++----
 http2/http2.go | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/http/http.go b/http/http.go
index 5cd241a..0ab4c25 100644
--- a/http/http.go
+++ b/http/http.go
@@ -60,9 +60,10 @@ var DefaultClient = http.Client{
 			if len(addr) == 0 {
 				return nil, ErrEmptyHostAddress
 			}
+			var conn net.Conn
 			var tlsConn *tls.Conn
 			for _, a := range addrs {
-				conn, err := DefaultDialer.DialContext(ctx, network, net.JoinHostPort(a, port))
+				conn, err = DefaultDialer.DialContext(ctx, network, net.JoinHostPort(a, port))
 				if err != nil {
 					continue
 				}
@@ -76,9 +77,6 @@ var DefaultClient = http.Client{
 				_ = tlsConn.Close()
 				tlsConn = nil
 			}
-			if tlsConn == nil {
-				return nil, ErrNoTLSConnection
-			}
 			return tlsConn, err
 		},
 	},
diff --git a/http2/http2.go b/http2/http2.go
index fae446b..6a49ea2 100644
--- a/http2/http2.go
+++ b/http2/http2.go
@@ -18,7 +18,6 @@ import (
 )
 
 var (
-	ErrNoTLSConnection  = errors.New("no tls connection")
 	ErrEmptyHostAddress = errors.New("empty host addr")
 )
 
@@ -61,9 +60,10 @@ var DefaultClient = http.Client{
 			if len(addr) == 0 {
 				return nil, ErrEmptyHostAddress
 			}
+			var conn net.Conn
 			var tlsConn *tls.Conn
 			for _, a := range addrs {
-				conn, err := DefaultDialer.DialContext(ctx, network, net.JoinHostPort(a, port))
+				conn, err = DefaultDialer.DialContext(ctx, network, net.JoinHostPort(a, port))
 				if err != nil {
 					continue
 				}
@@ -75,9 +75,6 @@ var DefaultClient = http.Client{
 				_ = tlsConn.Close()
 				tlsConn = nil
 			}
-			if tlsConn == nil {
-				return nil, ErrNoTLSConnection
-			}
 			return tlsConn, err
 		},
 	},