aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikio Hara <mikioh.public.networking@gmail.com>2018-11-06 12:48:17 +0900
committerMikio Hara <mikioh.public.networking@gmail.com>2018-11-06 06:57:39 +0000
commit510eea2dfcabbc8916c7c59aa37046269ad29497 (patch)
tree7abeb72ed285d3666911cab126bf464e4831a1be
parentc1a16b7dadfee27b03a2a70a20c3cf339a069a40 (diff)
downloadgo-510eea2dfcabbc8916c7c59aa37046269ad29497.tar.gz
go-510eea2dfcabbc8916c7c59aa37046269ad29497.zip
net/http: update bundled SOCKS client
Updates socks_bundle.go to git rev 26e67e7 for: - 26e67e7 internal/socks: fix socket descriptor leakage in Dialer.Dial Change-Id: I9ab27a85504d77f1ca2e97cb005f5e37fd3c3ff4 Reviewed-on: https://go-review.googlesource.com/c/147717 Run-TryBot: Mikio Hara <mikioh.public.networking@gmail.com> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/net/http/socks_bundle.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net/http/socks_bundle.go b/src/net/http/socks_bundle.go
index e4314b4128..e6640dd404 100644
--- a/src/net/http/socks_bundle.go
+++ b/src/net/http/socks_bundle.go
@@ -380,6 +380,7 @@ func (d *socksDialer) Dial(network, address string) (net.Conn, error) {
return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
}
if _, err := d.DialWithConn(context.Background(), c, network, address); err != nil {
+ c.Close()
return nil, err
}
return c, nil