Merge remote-tracking branch 'origin/develop' into develop

Author: marle3003

server/service/http.go

@@ -53,15 +53,30 @@ func NewHttpServer(port string, eh events.Handler) *HttpServer {
 		eh:       eh,
 		isTls:    false,
 	}
-	s.server.Handler = s
+	var protocols http.Protocols
+	protocols.SetHTTP1(true)
+	protocols.SetUnencryptedHTTP2(true)
+
+	s.server = &http.Server{
+		Addr:      fmt.Sprintf(":%v", port),
+		Handler:   s,
+		Protocols: &protocols,
+	}
 	return s
 }
 
 func NewHttpServerTls(port string, store *cert.Store, eh events.Handler) *HttpServer {
 	s := NewHttpServer(port, eh)
 	s.server.TLSConfig = &tls.Config{
 		GetCertificate: store.GetCertificate,
+		MinVersion:     tls.VersionTLS12,
+		MaxVersion:     tls.VersionTLS13,
 	}
+	var protocols http.Protocols
+	protocols.SetHTTP1(true)
+	protocols.SetHTTP2(true)
+
+	s.server.Protocols = &protocols
 	s.isTls = true
 	return s
 }