Skip to content

Commit

Permalink
Merge pull request #54866 from kad/automated-cherry-pick-of-#54413-or…
Browse files Browse the repository at this point in the history
…igin-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
```
  • Loading branch information
Kubernetes Submit Queue committed Oct 31, 2017
2 parents f88b2b1 + 3177084 commit c62f4ad
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (s *SpdyRoundTripper) Dial(req *http.Request) (net.Conn, error) {
func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) {
proxier := s.proxier
if proxier == nil {
proxier = http.ProxyFromEnvironment
proxier = utilnet.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
}
proxyURL, err := proxier(req)
if err != nil {
Expand Down

0 comments on commit c62f4ad

Please sign in to comment.