From 36d2188f2801f870add4d1cb274fb17c4733abc5 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Sun, 4 Oct 2026 19:12:12 +0200 Subject: [PATCH] refactor: simplification Signed-off-by: Valery Piashchynski --- servers/http11/http.go | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/servers/http11/http.go b/servers/http11/http.go index c28d802..cc66120 100644 --- a/servers/http11/http.go +++ b/servers/http11/http.go @@ -38,30 +38,7 @@ func NewHTTPServer(handler http.Handler, cfg *config.Config, errLog *log.Logger, redirectPort = cfg.SSLConfig.Port } - if cfg.HTTP2Config != nil && cfg.HTTP2Config.H2C { - protocols := new(http.Protocols) - protocols.SetHTTP1(true) - protocols.SetUnencryptedHTTP2(true) - return &Server{ - log: log, - redirect: redirect, - redirectPort: redirectPort, - address: cfg.Address, - unixSocket: cfg.UnixSocket, - proxyProtocol: cfg.ProxyProtocol, - http: &http.Server{ - Handler: handler, - Protocols: protocols, - HTTP2: &http.HTTP2Config{MaxConcurrentStreams: int(cfg.HTTP2Config.MaxConcurrentStreams)}, - ReadTimeout: time.Minute * 5, - WriteTimeout: time.Minute * 5, - IdleTimeout: time.Hour, - ReadHeaderTimeout: time.Minute * 5, - ErrorLog: errLog, - }, - } - } - return &Server{ + srv := &Server{ log: log, redirect: redirect, redirectPort: redirectPort, @@ -77,6 +54,15 @@ func NewHTTPServer(handler http.Handler, cfg *config.Config, errLog *log.Logger, ErrorLog: errLog, }, } + if cfg.HTTP2Config != nil && cfg.HTTP2Config.H2C { + protocols := new(http.Protocols) + protocols.SetHTTP1(true) + protocols.SetUnencryptedHTTP2(true) + srv.http.Protocols = protocols + srv.http.HTTP2 = &http.HTTP2Config{MaxConcurrentStreams: int(cfg.HTTP2Config.MaxConcurrentStreams)} + } + + return srv } // Serve is a blocking function