diff --git a/cmd/web.go b/cmd/web.go index d8bcba76d10cc..2b729c7d8c0c6 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -19,7 +19,6 @@ import ( "code.gitea.io/gitea/routers/routes" "github.com/Unknwon/com" - context2 "github.com/gorilla/context" "github.com/urfave/cli" "golang.org/x/crypto/acme/autocert" ini "gopkg.in/ini.v1" @@ -59,7 +58,7 @@ func runHTTPRedirector() { http.Redirect(w, r, target, http.StatusTemporaryRedirect) }) - var err = runHTTP(source, context2.ClearHandler(handler)) + var err = runHTTP(source, handler) if err != nil { log.Fatal("Failed to start port redirection: %v", err) @@ -164,16 +163,16 @@ func runWeb(ctx *cli.Context) error { var err error switch setting.Protocol { case setting.HTTP: - err = runHTTP(listenAddr, context2.ClearHandler(m)) + err = runHTTP(listenAddr, m) case setting.HTTPS: if setting.EnableLetsEncrypt { - err = runLetsEncrypt(listenAddr, setting.Domain, setting.LetsEncryptDirectory, setting.LetsEncryptEmail, context2.ClearHandler(m)) + err = runLetsEncrypt(listenAddr, setting.Domain, setting.LetsEncryptDirectory, setting.LetsEncryptEmail, m) break } if setting.RedirectOtherPort { go runHTTPRedirector() } - err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m)) + err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, m) case setting.FCGI: var listener net.Listener listener, err = net.Listen("tcp", listenAddr) @@ -185,7 +184,7 @@ func runWeb(ctx *cli.Context) error { log.Fatal("Failed to stop server: %v", err) } }() - err = fcgi.Serve(listener, context2.ClearHandler(m)) + err = fcgi.Serve(listener, m) case setting.UnixSocket: if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) { log.Fatal("Failed to remove unix socket directory %s: %v", listenAddr, err) @@ -201,7 +200,7 @@ func runWeb(ctx *cli.Context) error { if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil { log.Fatal("Failed to set permission of unix socket: %v", err) } - err = http.Serve(listener, context2.ClearHandler(m)) + err = http.Serve(listener, m) default: log.Fatal("Invalid protocol: %s", setting.Protocol) } diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go index 4b39c8e9f252c..860c6d5e009f7 100644 --- a/contrib/pr/checkout.go +++ b/contrib/pr/checkout.go @@ -29,7 +29,6 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - context2 "github.com/gorilla/context" "gopkg.in/src-d/go-git.v4" "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/plumbing" @@ -135,7 +134,7 @@ func runPR() { */ //Start the server - http.ListenAndServe(":8080", context2.ClearHandler(m)) + http.ListenAndServe(":8080", m) log.Printf("[PR] Cleaning up ...\n") /* diff --git a/go.mod b/go.mod index 804573e0d7bfd..591cf771467fc 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,6 @@ require ( github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 github.com/google/go-github/v24 v24.0.1 - github.com/gorilla/context v1.1.1 github.com/issue9/assert v1.3.2 // indirect github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d