diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-11 21:37:36 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-11 21:37:36 +0300 |
commit | 944e6bbde62c266aa3d50f0943a2716ac8d5df4b (patch) | |
tree | 1ae42214adc19ba1f536e3f17d794bbec667bfc4 /server.go | |
parent | 8166163d39f1f972b2bea2817bdc78cc0777faa3 (diff) |
Chdir first (always)
Diffstat (limited to 'server.go')
-rw-r--r-- | server.go | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -2,12 +2,12 @@ package main import ( "crypto/tls" + "fmt" "golang.org/x/net/http2" + "net" "net/http" -"net" - "time" "os" - "fmt" + "time" ) type tlsHandlerFunc func(*tls.ClientHelloInfo) (*tls.Certificate, error) @@ -45,12 +45,11 @@ func listenAndServe(fd uintptr, handler http.HandlerFunc, useHTTP2 bool, tlsConf if tlsConfig != nil { tlsListener := tls.NewListener(tcpKeepAliveListener{l.(*net.TCPListener)}, server.TLSConfig) return server.Serve(tlsListener) - } else { - return server.Serve(&tcpKeepAliveListener{l.(*net.TCPListener)}) } + return server.Serve(&tcpKeepAliveListener{l.(*net.TCPListener)}) } -func listenAndServeTLS(fd uintptr, cert, key []byte, handler http.HandlerFunc,tlsHandler tlsHandlerFunc, useHTTP2 bool) error { +func listenAndServeTLS(fd uintptr, cert, key []byte, handler http.HandlerFunc, tlsHandler tlsHandlerFunc, useHTTP2 bool) error { certificate, err := tls.X509KeyPair(cert, key) if err != nil { return err @@ -58,7 +57,7 @@ func listenAndServeTLS(fd uintptr, cert, key []byte, handler http.HandlerFunc,tl tlsConfig := &tls.Config{} tlsConfig.GetCertificate = tlsHandler - tlsConfig.NextProtos = []string { + tlsConfig.NextProtos = []string{ "http/1.1", } tlsConfig.Certificates = []tls.Certificate{ |