Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Added flag to disable http/2 support (still enabled by default)

Browse source
This commit is contained in:
Matthew Holt 2015-04-09 10:08:22 -06:00
parent 2a0cfb608d
commit d0a0216602
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.go
View file

@ -9,10 +9,14 @@ import (
"github.com/mholt/caddy/server" "github.com/mholt/caddy/server"
) )
var conf string var (
conf string
http2 bool
)
func init() { func init() {
flag.StringVar(&conf, "conf", server.DefaultConfigFile, "the configuration file to use") flag.StringVar(&conf, "conf", server.DefaultConfigFile, "the configuration file to use")
flag.BoolVar(&http2, "http2", true, "enable HTTP/2 support") // flag temporary until http2 merged into std lib
} }
func main() { func main() {
@ -34,6 +38,7 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
s.HTTP2 = http2
wg.Add(1) wg.Add(1)
go func(s *server.Server) { go func(s *server.Server) {
defer wg.Done() defer wg.Done()

3
server/server.go
View file

@ -26,6 +26,7 @@ var servers = make(map[string]*Server)
// Server represents an instance of a server, which serves // Server represents an instance of a server, which serves
// static content at a particular address (host and port). // static content at a particular address (host and port).
type Server struct { type Server struct {
HTTP2 bool // temporary while http2 is not in std lib (TODO: remove flag when part of std lib)
config config.Config config config.Config
fileServer middleware.Handler fileServer middleware.Handler
stack middleware.Handler stack middleware.Handler
@ -83,8 +84,10 @@ func (s *Server) Serve() error {
Handler: s, Handler: s,
} }
if s.HTTP2 {
// TODO: This call may not be necessary after HTTP/2 is merged into std lib // TODO: This call may not be necessary after HTTP/2 is merged into std lib
http2.ConfigureServer(server, nil) http2.ConfigureServer(server, nil)
}
// Execute shutdown commands on exit // Execute shutdown commands on exit
go func() { go func() {