1
0
mirror of https://github.com/golang/go synced 2024-11-23 00:10:07 -07:00

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>
This commit is contained in:
Bryan C. Mills 2021-03-11 15:04:16 -05:00
parent 4dd9c7cadc
commit b3896fc331

View File

@ -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 // Unlike DialContext, it returns a raw transport connection instead
// of a forward proxy connection. // of a forward proxy connection.
// //
// Dial uses context.Background internally.
//
// Deprecated: Use DialContext or DialWithConn instead. // Deprecated: Use DialContext or DialWithConn instead.
func (d *socksDialer) Dial(network, address string) (net.Conn, error) { func (d *socksDialer) Dial(network, address string) (net.Conn, error) {
if err := d.validateTarget(network, address); err != nil { if err := d.validateTarget(network, address); err != nil {