diff options
| author | Bryan C. Mills <bcmills@google.com> | 2021-03-11 15:04:16 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2021-03-11 20:46:21 +0000 |
| commit | b3896fc331c36a539f825f1f656cef3f9cdffd3f (patch) | |
| tree | cb771930f74e009e31a968b200a5ca04e27ce694 | |
| parent | 4dd9c7cadcbe689ef607931ed839456509e59104 (diff) | |
| download | go-b3896fc331c36a539f825f1f656cef3f9cdffd3f.tar.gz go-b3896fc331c36a539f825f1f656cef3f9cdffd3f.zip | |
net/http: revert change to generated file from CL 296152
This file is generated, so the fix needs to happen upstream.
The file can then be regenerated using 'go generate net/http'.
Updates #44143
Change-Id: I13a1e7677470ba84a06976e5bbe24f4ce1e7cfb2
Reviewed-on: https://go-review.googlesource.com/c/go/+/301069
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
| -rw-r--r-- | src/net/http/socks_bundle.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/net/http/socks_bundle.go b/src/net/http/socks_bundle.go index fc223910398..e4466695899 100644 --- a/src/net/http/socks_bundle.go +++ b/src/net/http/socks_bundle.go @@ -362,8 +362,6 @@ func (d *socksDialer) DialWithConn(ctx context.Context, c net.Conn, network, add // Unlike DialContext, it returns a raw transport connection instead // of a forward proxy connection. // -// Dial uses context.Background internally. -// // Deprecated: Use DialContext or DialWithConn instead. func (d *socksDialer) Dial(network, address string) (net.Conn, error) { if err := d.validateTarget(network, address); err != nil { |