serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-05 18:44:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Experimental HTTP/2 support

Browse source
This commit is contained in:
Matthew Holt 2015-03-16 11:44:54 -06:00
parent af56c5033c
commit fb78592425
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/server.go
View file

@ -9,6 +9,7 @@ import (
"net/http" "net/http"
"runtime" "runtime"
"github.com/bradfitz/http2"
"github.com/mholt/caddy/config" "github.com/mholt/caddy/config"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
) )
@ -62,14 +63,23 @@ func (s *Server) Serve() error {
return err return err
} }
if s.config.MaxCPU > 0 { // use highest value across all configurations
if s.config.MaxCPU > 0 && s.config.MaxCPU > runtime.GOMAXPROCS(0) {
runtime.GOMAXPROCS(s.config.MaxCPU) runtime.GOMAXPROCS(s.config.MaxCPU)
} }
server := &http.Server{
Addr: s.config.Address(),
Handler: s,
// TODO: Make more of the server configurable, also more http2 configurability
}
http2.ConfigureServer(server, nil) // TODO: This may not be necessary after HTTP/2 merged into std lib
if s.config.TLS.Enabled { if s.config.TLS.Enabled {
return http.ListenAndServeTLS(s.config.Address(), s.config.TLS.Certificate, s.config.TLS.Key, s) return server.ListenAndServeTLS(s.config.TLS.Certificate, s.config.TLS.Key)
} else { } else {
return http.ListenAndServe(s.config.Address(), s) return server.ListenAndServe()
} }
} }