ensure that the TLS conifg contains the ALPN protocol (#1305)

awbraunstein · vishr · commit e3717be4beda · 2019-03-12T17:54:16.000-07:00
diff --git a/echo.go b/echo.go
@@ -57,6 +57,7 @@ import (
 
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
+	"golang.org/x/crypto/acme"
 	"golang.org/x/crypto/acme/autocert"
 )
 
@@ -641,6 +642,7 @@ func (e *Echo) StartAutoTLS(address string) error {
 	s := e.TLSServer
 	s.TLSConfig = new(tls.Config)
 	s.TLSConfig.GetCertificate = e.AutoTLSManager.GetCertificate
+	s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, acme.ALPNProto)
 	return e.startTLS(address)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ import (`
`57`	`57`
`58`	`58`	`"github.com/labstack/gommon/color"`
`59`	`59`	`"github.com/labstack/gommon/log"`
	`60`	`+ "golang.org/x/crypto/acme"`
`60`	`61`	`"golang.org/x/crypto/acme/autocert"`
`61`	`62`	`)`
`62`	`63`
`@@ -641,6 +642,7 @@ func (e *Echo) StartAutoTLS(address string) error {`
`641`	`642`	`s := e.TLSServer`
`642`	`643`	`s.TLSConfig = new(tls.Config)`
`643`	`644`	`s.TLSConfig.GetCertificate = e.AutoTLSManager.GetCertificate`
	`645`	`+ s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, acme.ALPNProto)`
`644`	`646`	`return e.startTLS(address)`
`645`	`647`	`}`
`646`	`648`