Merge pull request #719 from harshavardhana/pr_out_fix_ssl_support_pointer_indirection_caused_nil_buffers

master
Harshavardhana 10 years ago
commit b71f15d32d
  1. 1
      .gitattributes
  2. 2
      Dockerfile
  3. 10
      pkg/server/server.go

1
.gitattributes vendored

@ -1 +0,0 @@
main.go ident

@ -31,4 +31,4 @@ RUN apt-get remove -y build-essential curl git && \
EXPOSE 9000 9001
CMD ["sh", "-c", "${GOPATH}/bin/minio mode memory 2G"]
CMD ["sh", "-c", "${GOPATH}/bin/minio server"]

@ -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)
}

Loading…
Cancel
Save