From f53f45492f595551888a6d510aadfebab0ff91e4 Mon Sep 17 00:00:00 2001 From: feistel <6742251-feistel@users.noreply.gitlab.com> Date: Wed, 11 Aug 2021 00:22:06 +0000 Subject: refactor: don't wrap handler with context ClearHandler --- server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server.go b/server.go index 07013e22..37939b9a 100644 --- a/server.go +++ b/server.go @@ -8,7 +8,6 @@ import ( "os" "time" - "github.com/gorilla/context" proxyproto "github.com/pires/go-proxyproto" "gitlab.com/gitlab-org/gitlab-pages/internal/netutil" @@ -46,7 +45,7 @@ func (ln *keepAliveListener) Accept() (net.Conn, error) { func (a *theApp) listenAndServe(config listenerConfig) error { // create server - server := &http.Server{Handler: context.ClearHandler(config.handler), TLSConfig: config.tlsConfig} + server := &http.Server{Handler: config.handler, TLSConfig: config.tlsConfig} // ensure http2 is enabled even if TLSConfig is not null // See https://github.com/golang/go/blob/97cee43c93cfccded197cd281f0a5885cdb605b4/src/net/http/server.go#L2947-L2954 -- cgit v1.2.3