Skip to content
This repository has been archived by the owner on Jan 24, 2019. It is now read-only.

Simplify HTTPS listening, leverage net/http methods #167

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify HTTPS listening, leverage net/http methods #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ func (s *Server) ServeHTTPS() {
MinVersion: tls.VersionTLS12,
MaxVersion: tls.VersionTLS12,
}
if config.NextProtos == nil {
config.NextProtos = []string{"http/1.1"}
}

var err error
config.Certificates = make([]tls.Certificate, 1)
Expand All @@ -70,21 +67,12 @@ func (s *Server) ServeHTTPS() {
log.Fatalf("FATAL: loading tls config (%s, %s) failed - %s", s.Opts.TLSCertFile, s.Opts.TLSKeyFile, err)
}

ln, err := net.Listen("tcp", addr)
if err != nil {
log.Fatalf("FATAL: listen (%s) failed - %s", addr, err)
srv := &http.Server{
Addr: addr,
Handler: s.Handler,
TLSConfig: config,
}
log.Printf("HTTPS: listening on %s", ln.Addr())

tlsListener := tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, config)
srv := &http.Server{Handler: s.Handler}
err = srv.Serve(tlsListener)

if err != nil && !strings.Contains(err.Error(), "use of closed network connection") {
log.Printf("ERROR: https.Serve() - %s", err)
}

log.Printf("HTTPS: closing %s", tlsListener.Addr())
log.Fatal(srv.ListenAndServeTLS("", ""))
}

// tcpKeepAliveListener sets TCP keep-alive timeouts on accepted
Expand Down