github-starred/frp
2
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2026-05-21 06:45:32 -06:00
Code Issues 40 Projects Packages Wiki Activity Actions 2

refactor: clean up code (#5308)
Some checks failed
golangci-lint / lint (push) Has been cancelled
Details

Browse source
This commit is contained in:
fatedier 2026-05-12 11:13:50 +08:00 • committed by GitHub
parent ad07d27914
commit a88e0e9a49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 2082 additions and 931 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/e2e/pkg/request/request.go
View file

@ -22,11 +22,10 @@ type Request struct {
protocol string
// for all protocol
addr string
port int
body []byte
timeout time.Duration
resolver *net.Resolver
addr string
port int
body []byte
timeout time.Duration
// for http or https
method string
@ -134,11 +133,6 @@ func (r *Request) Body(content []byte) *Request {
return r
}
func (r *Request) Resolver(resolver *net.Resolver) *Request {
r.resolver = resolver
return r
}
func (r *Request) Do() (*Response, error) {
var (
conn net.Conn
@ -169,7 +163,7 @@ func (r *Request) Do() (*Response, error) {
return nil, err
}
} else {
dialer := &net.Dialer{Resolver: r.resolver}
dialer := &net.Dialer{}
switch r.protocol {
case "tcp":
conn, err = dialer.Dial("tcp", addr)
@ -225,7 +219,6 @@ func (r *Request) sendHTTPRequest(method, urlstr string, host string, headers ma
Timeout: time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
Resolver: r.resolver,
}).DialContext,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,