aboutsummaryrefslogtreecommitdiff
path: root/src/net/http
diff options
context:
space:
mode:
authorAndrew Bonventre <andybons@golang.org>2019-06-10 13:44:56 -0400
committerAndrew Bonventre <andybons@golang.org>2019-06-10 20:32:36 +0000
commit5ce1819ccab65ceefa3198bbc78fb4dcac3cca6e (patch)
treedeed9093cfba511cf2b8159c38286b056c967dec /src/net/http
parent39f7561e1b38e46d24b62e7dcc772ba87f8a802b (diff)
downloadgo-5ce1819ccab65ceefa3198bbc78fb4dcac3cca6e.tar.xz
doc, net/http: add release notes for net/http and fix doc comments
Change-Id: I684e3522e387b2d96d5cfb2878d2f77bf4558443 Reviewed-on: https://go-review.googlesource.com/c/go/+/181545 Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/net/http')
-rw-r--r--src/net/http/server.go2
-rw-r--r--src/net/http/transport.go5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/net/http/server.go b/src/net/http/server.go
index 829bacfa83..e732378635 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -2565,7 +2565,7 @@ type Server struct {
BaseContext func(net.Listener) context.Context
// ConnContext optionally specifies a function that modifies
- // the context used for a newly connection c. The provided ctx
+ // the context used for a new connection c. The provided ctx
// is derived from the base context and has a ServerContextKey
// value.
ConnContext func(ctx context.Context, c net.Conn) context.Context
diff --git a/src/net/http/transport.go b/src/net/http/transport.go
index a3f674ca5c..26f642aa7a 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -271,8 +271,9 @@ type Transport struct {
tlsNextProtoWasNil bool // whether TLSNextProto was nil when the Once fired
// ForceAttemptHTTP2 controls whether HTTP/2 is enabled when a non-zero
- // TLSClientConfig or Dial, DialTLS or DialContext func is provided. By default, use of any those fields conservatively
- // disables HTTP/2. To use a customer dialer or TLS config and still attempt HTTP/2
+ // Dial, DialTLS, or DialContext func or TLSClientConfig is provided.
+ // By default, use of any those fields conservatively disables HTTP/2.
+ // To use a custom dialer or TLS config and still attempt HTTP/2
// upgrades, set this to true.
ForceAttemptHTTP2 bool
}