From 5094e9501ce3c5476cb5ad1b2b392f5e8b60ddff Mon Sep 17 00:00:00 2001 From: Andy Leap Date: Mon, 3 Nov 2014 20:46:53 -0500 Subject: [PATCH] Add basic FCGI support --- cmd/web.go | 3 +++ modules/setting/setting.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cmd/web.go b/cmd/web.go index d2ab01f1de9b..d59ab52ee261 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -9,6 +9,7 @@ import ( "html/template" "io/ioutil" "net/http" + "net/http/fcgi" "os" "path" "strings" @@ -416,6 +417,8 @@ func runWeb(*cli.Context) { err = http.ListenAndServe(listenAddr, m) case setting.HTTPS: err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m) + case setting.FCGI: + err = fcgi.Serve(nil, m) default: log.Fatal(4, "Invalid protocol: %s", setting.Protocol) } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index b8fc4dec2e62..64c32ec73a53 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -28,6 +28,7 @@ type Scheme string const ( HTTP Scheme = "http" HTTPS Scheme = "https" + FCGI Scheme = "fcgi" ) var ( @@ -181,6 +182,9 @@ func NewConfigContext() { CertFile = Cfg.MustValue("server", "CERT_FILE") KeyFile = Cfg.MustValue("server", "KEY_FILE") } + if Cfg.MustValue("server", "PROTOCOL") == "fcgi" { + Protocol = FCGI + } Domain = Cfg.MustValue("server", "DOMAIN", "localhost") HttpAddr = Cfg.MustValue("server", "HTTP_ADDR", "0.0.0.0") HttpPort = Cfg.MustValue("server", "HTTP_PORT", "3000")