Skip to content

Commit

Permalink
Revert "Merge pull request cloudfoundry#91 from cloudfoundry/fix-for-…
Browse files Browse the repository at this point in the history
…golang-1.23"

This reverts commit a546b52, reversing
changes made to 95a094e.
  • Loading branch information
Ops Manager committed Sep 4, 2024
1 parent 4c7a31b commit c71fd2c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cloudfoundry/bosh-utils

go 1.23.0
go 1.21.0

require (
code.cloudfoundry.org/clock v1.0.0
Expand Down
14 changes: 4 additions & 10 deletions httpclient/default_http_clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ import (
var (
DefaultClient = CreateDefaultClientInsecureSkipVerify()
defaultDialerContextFunc = SOCKS5DialContextFuncFromEnvironment((&net.Dialer{
Timeout: 30 * time.Second,
KeepAliveConfig: net.KeepAliveConfig{
Enable: true,
Interval: 30 * time.Second,
},
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}), proxy.NewSocks5Proxy(proxy.NewHostKey(), log.New(io.Discard, "", log.LstdFlags), 1*time.Minute))
)

Expand Down Expand Up @@ -59,11 +56,8 @@ func CreateDefaultClientInsecureSkipVerify() *http.Client {

func ResetDialerContext() {
defaultDialerContextFunc = SOCKS5DialContextFuncFromEnvironment((&net.Dialer{
Timeout: 30 * time.Second,
KeepAliveConfig: net.KeepAliveConfig{
Enable: true,
Interval: 30 * time.Second,
},
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}), proxy.NewSocks5Proxy(proxy.NewHostKey(), log.New(io.Discard, "", log.LstdFlags), 1*time.Minute))
}

Expand Down

0 comments on commit c71fd2c

Please sign in to comment.