diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-31 17:16:02 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-31 17:16:02 +0800 |
| commit | bf85c82087adaf5e9bebdcd3c863e2e0a061c746 (patch) | |
| tree | 5f874b736b0fbb796ac735d064bb9a714a856025 /cmd/web.go | |
| parent | c0904f1942071ce870ab9d87bd6c7f49f614ee82 (diff) | |
| download | gitea-bf85c82087adaf5e9bebdcd3c863e2e0a061c746.tar.gz gitea-bf85c82087adaf5e9bebdcd3c863e2e0a061c746.zip | |
fix windows build broken by #416
Diffstat (limited to 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/cmd/web.go b/cmd/web.go index ecaf74daaa..7ba7a7ded4 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -5,7 +5,6 @@ package cmd import ( - "crypto/tls" "fmt" "net" "net/http" @@ -31,7 +30,6 @@ import ( "code.gitea.io/gitea/routers/repo" "code.gitea.io/gitea/routers/user" - "github.com/facebookgo/grace/gracehttp" "github.com/go-macaron/binding" "github.com/go-macaron/cache" "github.com/go-macaron/captcha" @@ -616,29 +614,9 @@ func runWeb(ctx *cli.Context) error { var err error switch setting.Protocol { case setting.HTTP: - err = gracehttp.Serve(&http.Server{ - Addr: listenAddr, - Handler: m, - }) + err = runHTTP(listenAddr, m) case setting.HTTPS: - config := &tls.Config{ - MinVersion: tls.VersionTLS10, - } - if config.NextProtos == nil { - config.NextProtos = []string{"http/1.1"} - } - - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(setting.CertFile, setting.KeyFile) - if err != nil { - log.Fatal(4, "Failed to load https cert file %s: %v", listenAddr, err) - } - - err = gracehttp.Serve(&http.Server{ - Addr: listenAddr, - Handler: m, - TLSConfig: config, - }) + err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, m) case setting.FCGI: err = fcgi.Serve(nil, m) case setting.UnixSocket: |