admin/spray
1
0
Fork 0
mirror of https://github.com/chainreactors/spray.git synced 2025-11-05 10:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix standard client null proxy bug

Browse Source
This commit is contained in:
M09Ic 2024-03-03 01:59:56 +08:00
parent 9eb4a13e20
commit b487e3da15
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/ihttp/client.go
View File

@ -26,8 +26,9 @@ const (
) )
func NewClient(config *ClientConfig) *Client { func NewClient(config *ClientConfig) *Client {
var client *Client
if config.Type == FAST { if config.Type == FAST {
return &Client{ client = &Client{
fastClient: &fasthttp.Client{ fastClient: &fasthttp.Client{
TLSConfig: &tls.Config{ TLSConfig: &tls.Config{
Renegotiation: tls.RenegotiateOnceAsClient, Renegotiation: tls.RenegotiateOnceAsClient,
@ -48,7 +49,7 @@ func NewClient(config *ClientConfig) *Client {
Config: config, Config: config,
} }
} else { } else {
return &Client{ client = &Client{
standardClient: &http.Client{ standardClient: &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
//Proxy: Proxy, //Proxy: Proxy,
@ -60,9 +61,6 @@ func NewClient(config *ClientConfig) *Client {
MaxConnsPerHost: config.Thread * 3 / 2, MaxConnsPerHost: config.Thread * 3 / 2,
IdleConnTimeout: config.Timeout, IdleConnTimeout: config.Timeout,
ReadBufferSize: 16384, // 16k ReadBufferSize: 16384, // 16k
Proxy: func(_ *http.Request) (*url.URL, error) {
return url.Parse(config.ProxyAddr)
},
}, },
Timeout: config.Timeout, Timeout: config.Timeout,
CheckRedirect: func(req *http.Request, via []*http.Request) error { CheckRedirect: func(req *http.Request, via []*http.Request) error {
@ -71,7 +69,13 @@ func NewClient(config *ClientConfig) *Client {
}, },
Config: config, Config: config,
} }
if config.ProxyAddr != "" {
client.standardClient.Transport.(*http.Transport).Proxy = func(_ *http.Request) (*url.URL, error) {
return url.Parse(config.ProxyAddr)
}
}
} }
return client
} }
type ClientConfig struct { type ClientConfig struct {