diff --git a/doc/go1.13.html b/doc/go1.13.html index ef4e0123e6..5caae1315d 100644 --- a/doc/go1.13.html +++ b/doc/go1.13.html @@ -220,23 +220,31 @@ TODO
net/http

- TODO: https://golang.org/cl/130256: introduce DialerAndTLSConfigSupportsHTTP2 in Transport + The new field Transport.ForceAttemptHTTP2 + controls whether HTTP/2 is enabled when a non-zero Dial, DialTLS, or DialContext + func or TLSClientConfig is provided.

- TODO: https://golang.org/cl/140357: make Transport.MaxConnsPerHost work for HTTP/2 + When reusing HTTP/2, the Transport no longer performs unnecessary TLS handshakes.

- TODO: https://golang.org/cl/154383: make TimeoutHandler's ResponseWriter implement Pusher + TimeoutHandler's + ResponseWriter now implements the + Pusher and Flusher interfaces.

- TODO: https://golang.org/cl/167681: add Server BaseContext & ConnContext fields to control early context + The new Server fields + BaseContext and + ConnContext + allow finer control over the Context values provided to requests and connections.

- TODO: https://golang.org/cl/173658: export Header.Clone, reduce its allocations, use it everywhere + The new Header method + Clone returns a copy of the receiver.

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 }