Merge branch 'main' into fix-14580

6543 · web-flow · commit ae795389bda0 · 2021-07-13T19:31:51.000+02:00
diff --git a/cmd/web_letsencrypt.go b/cmd/web_letsencrypt.go
@@ -54,6 +54,7 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
 	}
 
 	tlsConfig := magic.TLSConfig()
+	tlsConfig.NextProtos = append(tlsConfig.NextProtos, "h2")
 
 	if enableHTTPChallenge {
 		go func() {
diff --git a/modules/graceful/server.go b/modules/graceful/server.go
@@ -106,7 +106,7 @@ func (srv *Server) ListenAndServe(serve ServeFunction) error {
 func (srv *Server) ListenAndServeTLS(certFile, keyFile string, serve ServeFunction) error {
 	config := &tls.Config{}
 	if config.NextProtos == nil {
-		config.NextProtos = []string{"http/1.1"}
+		config.NextProtos = []string{"h2", "http/1.1"}
 	}
 
 	config.Certificates = make([]tls.Certificate, 1)

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`tlsConfig := magic.TLSConfig()`
	`57`	`+ tlsConfig.NextProtos = append(tlsConfig.NextProtos, "h2")`
`57`	`58`
`58`	`59`	`if enableHTTPChallenge {`
`59`	`60`	`go func() {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (srv *Server) ListenAndServe(serve ServeFunction) error {`
`106`	`106`	`func (srv *Server) ListenAndServeTLS(certFile, keyFile string, serve ServeFunction) error {`
`107`	`107`	`config := &tls.Config{}`
`108`	`108`	`if config.NextProtos == nil {`
`109`		`- config.NextProtos = []string{"http/1.1"}`
	`109`	`+ config.NextProtos = []string{"h2", "http/1.1"}`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`config.Certificates = make([]tls.Certificate, 1)`