go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-07-17 01:43:02 +02:00
Code Issues Releases Activity

Separated tlsconfig

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2016-09-24 22:01:38 -07:00
parent fc8c033f3c
commit 17d59627a8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
echo.go
View File

@ -63,6 +63,7 @@ type (
Echo struct {
Server *http.Server
TLSServer *http.Server
TLSConfig *tls.Config
ShutdownTimeout time.Duration
DisableHTTP2 bool
Debug bool
@ -232,6 +233,7 @@ func New() (e *Echo) {
e = &Echo{
Server: new(http.Server),
TLSServer: new(http.Server),
TLSConfig: new(tls.Config),
ShutdownTimeout: 15 * time.Second,
maxParam: new(int),
gracefulTLS: new(graceful.Server),
@ -526,11 +528,11 @@ func (e *Echo) StartTLS(address string, certFile, keyFile string) (err error) {
if certFile == "" || keyFile == "" {
return errors.New("invalid tls configuration")
}
config := &tls.Config{}
if e.TLSServer.TLSConfig != nil {
config := new(tls.Config)
// if e.TLSConfig != nil {
// TODO: https://github.com/golang/go/commit/d24f446a90ea94b87591bf16228d7d871fec3d92
*config = *e.TLSServer.TLSConfig
}
*config = *e.TLSConfig
// }
if !e.DisableHTTP2 {
config.NextProtos = append(config.NextProtos, "h2")
}