Skip to content

Commit 5134afd

Browse files
Merge pull request #54866 from kad/automated-cherry-pick-of-#54413-origin-release-1.8
Automatic merge from submit-queue. Automated cherry pick of #54413 Cherry pick of #54413 on release-1.8. #54413: Use CIDR-aware proxy resolver for SPDY RoundTripper **Release note**: ```release-note - API machinery's httpstream/spdy calls now support CIDR notation for NO_PROXY ``` Kubernetes-commit: c62f4ad5bb5a3aba49fffaa67c76eedf22a371a5
2 parents 019ae5a + b22cad1 commit 5134afd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Godeps/Godeps.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/util/httpstream/spdy/roundtripper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (s *SpdyRoundTripper) Dial(req *http.Request) (net.Conn, error) {
110110
func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) {
111111
proxier := s.proxier
112112
if proxier == nil {
113-
proxier = http.ProxyFromEnvironment
113+
proxier = utilnet.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
114114
}
115115
proxyURL, err := proxier(req)
116116
if err != nil {

0 commit comments

Comments
 (0)