From 0e4ae27caaf729d5ba748559329586f7fb063e70 Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Tue, 2 Feb 2016 14:09:47 +0000 Subject: [PATCH] Use pretty 404 pages in repo.HTTPBackend --- routers/repo/http.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index e6726936e..5e81e73ce 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -215,7 +215,7 @@ func HTTP(ctx *middleware.Context) { } } - HTTPBackend(&Config{ + HTTPBackend(ctx, &Config{ RepoRootPath: setting.RepoRootPath, GitBinPath: "git", UploadPack: true, @@ -286,7 +286,7 @@ func getGitDir(config *Config, fPath string) (string, error) { } // Request handling function -func HTTPBackend(config *Config) http.HandlerFunc { +func HTTPBackend(ctx *middleware.Context, config *Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { for _, route := range routes { r.URL.Path = strings.ToLower(r.URL.Path) // blue: In case some repo name has upper case name @@ -300,7 +300,7 @@ func HTTPBackend(config *Config) http.HandlerFunc { dir, err := getGitDir(config, m[1]) if err != nil { log.GitLogger.Error(4, err.Error()) - renderNotFound(w) + ctx.Handle(404, "HTTPBackend", err) return } @@ -309,7 +309,7 @@ func HTTPBackend(config *Config) http.HandlerFunc { } } - renderNotFound(w) + ctx.Handle(404, "HTTPBackend", nil) return } } @@ -433,8 +433,6 @@ func sendFile(contentType string, hr handler) { w, r := hr.w, hr.r reqFile := path.Join(hr.Dir, hr.File) - // fmt.Println("sendFile:", reqFile) - f, err := os.Stat(reqFile) if os.IsNotExist(err) { renderNotFound(w)