1 files changed, 25 insertions, 15 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index 916cbd0..98a8ee6 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -18,6 +18,7 @@ import (
         "github.com/labstack/echo/v4"
         "github.com/labstack/echo/v4/middleware"
         "github.com/labstack/gommon/log"
+        "github.com/quic-go/quic-go/http3"
 )
 
 // Docs: https://echo.labstack.com/guide/
@@ -235,22 +236,16 @@ func (w *EchoWrapper) configureCombinedLogging(c *EchoConfig) error {
         return nil
 }
 
-func (w *EchoWrapper) makeServerJob(s *http.Server, echoInit bool) service.RunnerFunc {
+func (w *EchoWrapper) makeServerJob(s webServer) service.RunnerFunc {
         return func(ctx context.Context, wg *sync.WaitGroup) error {
                 wg.Add(1)
                 defer wg.Done()
 
-                w.Logger.Infof("Starting server with address: %s", s.Addr)
+                s.LogStart(w.Logger)
 
                 err := make(chan error)
                 go func() {
-                        if s.TLSConfig == nil && echoInit {
-                                err <- w.Echo.StartServer(s)
-                        } else if s.TLSConfig == nil && !echoInit {
-                                err <- s.ListenAndServe()
-                        } else {
-                                err <- s.ListenAndServeTLS("", "")
-                        }
+                        err <- s.ListenAndServe()
                 }()
                 select {
                 case e := <-err:
@@ -267,12 +262,13 @@ func (w *EchoWrapper) makeServerJob(s *http.Server, echoInit bool) service.Runne
 }
 
 func (w *EchoWrapper) buildServers(c *EchoConfig, bindings *AddressPortConfig) {
-        for i, a := range bindings.HttpBindings() {
+        for _, a := range bindings.HttpBindings() {
                 s := &http.Server{
-                        Addr:    a,
-                        Handler: w,
+                        Addr:     a,
+                        Handler:  w,
+                        ErrorLog: w.StdLogger,
                 }
-                w.runner.AddJob(w.makeServerJob(s, i == 0))
+                w.runner.AddJob(w.makeServerJob(&netHttpWrapper{s}))
         }
 
         for _, a := range bindings.TlsBindings() {
@@ -281,11 +277,25 @@ func (w *EchoWrapper) buildServers(c *EchoConfig, bindings *AddressPortConfig) {
                         TLSConfig: &tls.Config{
                                 MinVersion:     tls.VersionTLS12,
                                 GetCertificate: c.Autocert.GetCertificate,
-                                NextProtos:     []string{"h2", "http/1.1"}, // enable HTTP/2
+                                NextProtos:     []string{"h3", "h2", "http/1.1"},
                         },
+                        Handler:  w,
+                        ErrorLog: w.StdLogger,
+                }
+                w.runner.AddJob(w.makeServerJob(&netHttpWrapper{s}))
+        }
+
+        for _, a := range bindings.QuicBindings() {
+                q := &http3.Server{
+                        Addr: a,
+                        TLSConfig: http3.ConfigureTLSConfig(&tls.Config{
+                                MinVersion:     tls.VersionTLS13,
+                                GetCertificate: c.Autocert.GetCertificate,
+                        }),
                         Handler: w,
                 }
-                w.runner.AddJob(w.makeServerJob(s, false))
+                w.runner.AddJob(w.makeServerJob(&http3Wrapper{q}))
+                w.Use(glmw.Http3AltSvcMiddleware(bindings.QuicPort))
         }
 }