]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: revert change to generated file from CL 296152
authorBryan C. Mills <bcmills@google.com>
Thu, 11 Mar 2021 20:04:16 +0000 (15:04 -0500)
committerBryan C. Mills <bcmills@google.com>
Thu, 11 Mar 2021 20:46:21 +0000 (20:46 +0000)
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>

src/net/http/socks_bundle.go

index fc2239103982f33ea2b9de244dfd67055310caa7..e446669589905dcf71029c6774d75eab50279d76 100644 (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
 // 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 {