From f08f1cd2e97835dbaa7c509b837265774ae39dac Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 27 Apr 2016 16:32:37 -0500 Subject: [PATCH] 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 --- src/net/dial.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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. -- 2.50.0