From: Brad Fitzpatrick Date: Fri, 18 Dec 2015 18:26:51 +0000 (+0000) Subject: net/http: document that Server.TLSNextProto has automatic HTTP/2 also X-Git-Tag: go1.6beta2~215 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b73e247a8eeef69ea87afea80c7a7a1b88e61553;p=gostls13.git net/http: document that Server.TLSNextProto has automatic HTTP/2 also Copy the same sentence from Transport.TLSNextProto. Change-Id: Ib67bf054e891a68be8ba466a8c52968363374d16 Reviewed-on: https://go-review.googlesource.com/18031 Reviewed-by: Russ Cox --- diff --git a/src/net/http/server.go b/src/net/http/server.go index 8a854f03b9..15a1cc4144 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -1935,6 +1935,7 @@ type Server struct { // handle HTTP requests and will initialize the Request's TLS // and RemoteAddr if not already set. The connection is // automatically closed when the function returns. + // If TLSNextProto is nil, HTTP/2 support is enabled automatically. TLSNextProto map[string]func(*Server, *tls.Conn, Handler) // ConnState specifies an optional callback function that is