From: Mikio Hara <mikioh.public.networking@gmail.com>
Date: Tue, 6 Nov 2018 03:48:17 +0000 (+0900)
Subject: net/http: update bundled SOCKS client
X-Git-Tag: go1.12beta1~474
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=510eea2dfcabbc8916c7c59aa37046269ad29497;p=gostls13.git

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>
---

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