From: Anmol Sethi <anmol@aubble.com>
Date: Thu, 2 Jun 2016 02:35:09 +0000 (-0400)
Subject: net/http: http.Request.Context doc fix
X-Git-Tag: go1.7beta2~77
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=15db3654b8e9fda6d41f4389879c8cd370f71a7e;p=gostls13.git

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>
---

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