aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnmol Sethi <anmol@aubble.com>2016-06-01 22:35:09 -0400
committerAndrew Gerrand <adg@golang.org>2016-06-02 05:25:46 +0000
commit15db3654b8e9fda6d41f4389879c8cd370f71a7e (patch)
treef1c66d1cf59900e4d59e672cccea6c8520d1c1fb /src
parent6a0fd18016794a681580c8ca971c7d2d26f287bf (diff)
downloadgo-15db3654b8e9fda6d41f4389879c8cd370f71a7e.tar.xz
net/http: http.Request.Context doc fix
The comment on http.Request.Context says that the context is canceled when the client's connection closes even though this has not been implemented. See #15927 Change-Id: I50b68638303dafd70f77f8f778e6caff102d3350 Reviewed-on: https://go-review.googlesource.com/23672 Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/net/http/request.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/http/request.go b/src/net/http/request.go
index e8780dea94..dc5559282d 100644
--- a/src/net/http/request.go
+++ b/src/net/http/request.go
@@ -275,9 +275,9 @@ type Request struct {
//
// For outgoing client requests, the context controls cancelation.
//
-// For incoming server requests, the context is canceled when either
-// the client's connection closes, or when the ServeHTTP method
-// returns.
+// For incoming server requests, the context is canceled when the
+// ServeHTTP method returns. For its associated values, see
+// ServerContextKey and LocalAddrContextKey.
func (r *Request) Context() context.Context {
if r.ctx != nil {
return r.ctx