From: Dan Peterson Date: Mon, 16 May 2016 13:11:59 +0000 (-0300) Subject: net/http: mention ALPN in http.Server.TLSNextProto documentation X-Git-Tag: go1.7beta1~207 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b66b97e0a120880e37b03eba00c0c7679f0a70c1;p=gostls13.git net/http: mention ALPN in http.Server.TLSNextProto documentation Make clear negotiation can happen via NPN or ALPN, similar to http.Transport.TLSNextProto and x/net/http2.NextProtoTLS. Change-Id: Ied00b842bc04e11159d6d2107beda921cefbc6ca Reviewed-on: https://go-review.googlesource.com/23108 Reviewed-by: Brad Fitzpatrick --- diff --git a/src/net/http/server.go b/src/net/http/server.go index d0be7d01db..d4e38b6ad0 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -2082,7 +2082,7 @@ type Server struct { MaxHeaderBytes int // TLSNextProto optionally specifies a function to take over - // ownership of the provided TLS connection when an NPN + // ownership of the provided TLS connection when an NPN/ALPN // protocol upgrade has occurred. The map key is the protocol // name negotiated. The Handler argument should be used to // handle HTTP requests and will initialize the Request's TLS