diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-11 21:24:45 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-11 21:24:45 +0300 |
commit | 3d691bf42432304a3ae6d6465c3f596629891e74 (patch) | |
tree | b37d38ccf1a672a4c862f53b4534e07db5122091 /server.go | |
parent | 3824fc8ca34b8f94ae7ef7550aec196dbbfdecf5 (diff) |
Move most of configuration to appConfig
Diffstat (limited to 'server.go')
-rw-r--r-- | server.go | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -26,11 +26,11 @@ func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) { return tc, nil } -func listenAndServe(fd uintptr, handler http.HandlerFunc, tlsConfig *tls.Config) error { +func listenAndServe(fd uintptr, handler http.HandlerFunc, useHTTP2 bool, tlsConfig *tls.Config) error { // create server server := &http.Server{Handler: handler, TLSConfig: tlsConfig} - if *http2proto { + if useHTTP2 { err := http2.ConfigureServer(server, &http2.Server{}) if err != nil { return err @@ -50,7 +50,7 @@ func listenAndServe(fd uintptr, handler http.HandlerFunc, tlsConfig *tls.Config) } } -func listenAndServeTLS(fd uintptr, cert, key []byte, handler http.HandlerFunc, tlsHandler tlsHandlerFunc) 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 @@ -64,5 +64,5 @@ func listenAndServeTLS(fd uintptr, cert, key []byte, handler http.HandlerFunc, t tlsConfig.Certificates = []tls.Certificate{ certificate, } - return listenAndServe(fd, handler, tlsConfig) + return listenAndServe(fd, handler, useHTTP2, tlsConfig) } |