github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Re-enable HTTP/2 for Go 1.7.

Browse Source 
* Since Go 1.7 HTTP/2 support is enabled only if TLSConfig.NextProtos
   includes the string "h2".
 * see mholt/caddy#975
This commit is contained in:
Wolfgang Johannes Kohnen 2016-07-30 17:55:53 +00:00
parent 7157bdc79d
commit d88dd74dec
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 {