]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: mention ALPN in http.Server.TLSNextProto documentation
authorDan Peterson <dpiddy@gmail.com>
Mon, 16 May 2016 13:11:59 +0000 (10:11 -0300)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 16 May 2016 15:05:04 +0000 (15:05 +0000)
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 <bradfitz@golang.org>
src/net/http/server.go

index d0be7d01dbd0aad54e6c252e29fc82723c2f13c8..d4e38b6ad094206f544fb69bdb34bb28cb158c49 100644 (file)
@@ -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