fumiama/terasu
1
0
Fork 0
mirror of https://github.com/fumiama/terasu.git synced 2026-06-24 06:40:24 +08:00
Code Activity

fix: check nil tls conn

Browse Source
This commit is contained in:
源文雨
2024-04-19 01:07:15 +09:00
parent 406b2cbe1d
commit 5999fcf7db
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http/http.go
View File

@@ -60,9 +60,10 @@ var DefaultClient = http.Client{
if len(addr) == 0 { if len(addr) == 0 {
return nil, ErrEmptyHostAddress return nil, ErrEmptyHostAddress
} }
var conn net.Conn
var tlsConn *tls.Conn var tlsConn *tls.Conn
for _, a := range addrs { 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 { if err != nil {
continue continue
} }
@@ -76,9 +77,6 @@ var DefaultClient = http.Client{
_ = tlsConn.Close() _ = tlsConn.Close()
tlsConn = nil tlsConn = nil
} }
if tlsConn == nil {
return nil, ErrNoTLSConnection
}
return tlsConn, err return tlsConn, err
}, },
}, },

7
http2/http2.go
View File

@@ -18,7 +18,6 @@ import (
) )
var ( var (
ErrNoTLSConnection = errors.New("no tls connection")
ErrEmptyHostAddress = errors.New("empty host addr") ErrEmptyHostAddress = errors.New("empty host addr")
) )
@@ -61,9 +60,10 @@ var DefaultClient = http.Client{
if len(addr) == 0 { if len(addr) == 0 {
return nil, ErrEmptyHostAddress return nil, ErrEmptyHostAddress
} }
var conn net.Conn
var tlsConn *tls.Conn var tlsConn *tls.Conn
for _, a := range addrs { 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 { if err != nil {
continue continue
} }
@@ -75,9 +75,6 @@ var DefaultClient = http.Client{
_ = tlsConn.Close() _ = tlsConn.Close()
tlsConn = nil tlsConn = nil
} }
if tlsConn == nil {
return nil, ErrNoTLSConnection
}
return tlsConn, err return tlsConn, err
}, },
}, },