bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

read Client's timeout for net.Dialer

Browse Source 
make sure Client.Transport is *http.Transport
This commit is contained in:
kirile
2020-07-04 16:43:30 +08:00
committed by kirileec
parent 977827e453
commit f3f6adb03a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/ghttp/ghttp_client_config.go
View File

@ -176,7 +176,9 @@ func (c *Client) SetProxy(proxyURL string) {
return
}
if _proxy.Scheme == "http" {
c.Transport.(*http.Transport).Proxy = http.ProxyURL(_proxy)
if _, ok := c.Transport.(*http.Transport); ok {
c.Transport.(*http.Transport).Proxy = http.ProxyURL(_proxy)
}
} else {
var auth = &proxy.Auth{}
user := _proxy.User.Username()
@ -196,15 +198,17 @@ func (c *Client) SetProxy(proxyURL string) {
_proxy.Host,
auth,
&net.Dialer{
Timeout: 10 * time.Second,
KeepAlive: 10 * time.Second,
Timeout: c.Client.Timeout,
KeepAlive: c.Client.Timeout,
},
)
if err != nil {
return
}
c.Transport.(*http.Transport).DialContext = func(ctx context.Context, network, addr string) (conn net.Conn, e error) {
return dialer.Dial(network, addr)
if _, ok := c.Transport.(*http.Transport); ok {
c.Transport.(*http.Transport).DialContext = func(ctx context.Context, network, addr string) (conn net.Conn, e error) {
return dialer.Dial(network, addr)
}
}
//c.SetTimeout(10*time.Second)
}