Fix a bug where HTTP 2 connections were not working (#72)

chitoku-k · web-flow · commit b94b2d647d1e · 2021-11-25T23:19:44.000+01:00
Signed-off-by: Chitoku &lt;odango@chitoku.jp&gt;
diff --git a/web/tls_config.go b/web/tls_config.go
@@ -240,7 +240,12 @@ func Serve(l net.Listener, server *http.Server, tlsConfigPath string, logger log
 	// Set the GetConfigForClient method of the HTTPS server so that the config
 	// and certs are reloaded on new connections.
 	server.TLSConfig.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) {
-		return getTLSConfig(tlsConfigPath)
+		config, err := getTLSConfig(tlsConfigPath)
+		if err != nil {
+			return nil, err
+		}
+		config.NextProtos = server.TLSConfig.NextProtos
+		return config, nil
 	}
 	return server.ServeTLS(l, "", "")
 }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,12 @@ func Serve(l net.Listener, server *http.Server, tlsConfigPath string, logger log`
`240`	`240`	`// Set the GetConfigForClient method of the HTTPS server so that the config`
`241`	`241`	`// and certs are reloaded on new connections.`
`242`	`242`	`server.TLSConfig.GetConfigForClient = func(tls.ClientHelloInfo) (tls.Config, error) {`
`243`		`- return getTLSConfig(tlsConfigPath)`
	`243`	`+ config, err := getTLSConfig(tlsConfigPath)`
	`244`	`+ if err != nil {`
	`245`	`+ return nil, err`
	`246`	`+ }`
	`247`	`+ config.NextProtos = server.TLSConfig.NextProtos`
	`248`	`+ return config, nil`
`244`	`249`	`}`
`245`	`250`	`return server.ServeTLS(l, "", "")`
`246`	`251`	`}`