From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 27 Apr 2016 21:32:37 +0000 (-0500)
Subject: net: clarify DialContext's use of its provided context
X-Git-Tag: go1.7beta1~443
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f08f1cd2e97835dbaa7c509b837265774ae39dac;p=gostls13.git

net: clarify DialContext's use of its provided context

Fixes #15325

Change-Id: I60137ecf27e236e97734b1730ce29ab23e9fe07f
Reviewed-on: https://go-review.googlesource.com/22509
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/net/dial.go b/src/net/dial.go
index 3443161004..05d7e98027 100644
--- a/src/net/dial.go
+++ b/src/net/dial.go
@@ -284,7 +284,10 @@ func (d *Dialer) Dial(network, address string) (Conn, error) {
 // DialContext connects to the address on the named network using
 // the provided context.
 //
-// The provided Context must be non-nil.
+// The provided Context must be non-nil. If the context expires before
+// the connection is complete, an error is returned. Once successfully
+// connected, any expiration of the context will not affect the
+// connection.
 //
 // See func Dial for a description of the network and address
 // parameters.