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

Merge pull request #976 from wjkohnen/h2

Browse source 
Re-enable HTTP/2 for Go 1.7.
This commit is contained in:
Matt Holt 2016-08-01 15:06:44 -06:00 committed by GitHub
commit da5b3cfc50
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
caddyhttp/httpserver/server.go
View file

@ -92,6 +92,10 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Since Go 1.7 HTTP/2 is enabled only if TLSConfig.NextProtos includes the string "h2".
if HTTP2 && s.Server.TLSConfig != nil && len(s.Server.TLSConfig.NextProtos) == 0 {
s.Server.TLSConfig.NextProtos = []string{"h2"}
}
// Compile custom middleware for every site (enables virtual hosting) // Compile custom middleware for every site (enables virtual hosting)
for _, site := range group { for _, site := range group {