Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 21:37:36 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 21:37:36 +0300
commit944e6bbde62c266aa3d50f0943a2716ac8d5df4b (patch)
tree1ae42214adc19ba1f536e3f17d794bbec667bfc4 /server.go
parent8166163d39f1f972b2bea2817bdc78cc0777faa3 (diff)
Chdir first (always)
Diffstat (limited to 'server.go')
-rw-r--r--server.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/server.go b/server.go
index 3f267b65..bee3e5f2 100644
--- a/server.go
+++ b/server.go
@@ -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{