Fix SSL support, pointer indirection caused nil buffers

This commit is contained in:
Harshavardhana
2015-07-07 20:02:56 -07:00
parent f737c0540e
commit 2413a110e6
3 changed files with 4 additions and 9 deletions

View File

@@ -39,14 +39,10 @@ func getAPIServer(conf api.Config, apiHandler http.Handler) (*http.Server, error
}
if conf.TLS {
config := &tls.Config{}
if httpServer.TLSConfig != nil {
*config = *httpServer.TLSConfig
}
var err error
config.Certificates = make([]tls.Certificate, 1)
config.Certificates[0], err = tls.LoadX509KeyPair(conf.CertFile, conf.KeyFile)
httpServer.TLSConfig = &tls.Config{}
httpServer.TLSConfig.Certificates = make([]tls.Certificate, 1)
httpServer.TLSConfig.Certificates[0], err = tls.LoadX509KeyPair(conf.CertFile, conf.KeyFile)
if err != nil {
return nil, iodine.New(err, nil)
}