From 3f280f89e7471a6dcdaefccc64a8d39188970e63 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Wed, 23 Mar 2022 05:54:07 +0100 Subject: Update HTTP status codes to modern codes (#18063) * 2xx/3xx/4xx/5xx -> http.Status... * http.StatusFound -> http.StatusTemporaryRedirect * http.StatusMovedPermanently -> http.StatusPermanentRedirect --- routers/install/install.go | 2 +- routers/install/routes.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'routers/install') diff --git a/routers/install/install.go b/routers/install/install.go index 98eeb5f8a0..164ce68405 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -59,7 +59,7 @@ func Init(next http.Handler) http.Handler { return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) { if setting.InstallLock { resp.Header().Add("Refresh", "1; url="+setting.AppURL+"user/login") - _ = rnd.HTML(resp, 200, string(tplPostInstall), nil) + _ = rnd.HTML(resp, http.StatusOK, string(tplPostInstall), nil) return } locale := middleware.Locale(resp, req) diff --git a/routers/install/routes.go b/routers/install/routes.go index f377cd40c9..ef96e99628 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -41,9 +41,9 @@ func installRecovery() func(next http.Handler) http.Handler { combinedErr := fmt.Sprintf("PANIC: %v\n%s", err, log.Stack(2)) log.Error("%s", combinedErr) if setting.IsProd { - http.Error(w, http.StatusText(500), 500) + http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) } else { - http.Error(w, combinedErr, 500) + http.Error(w, combinedErr, http.StatusInternalServerError) } } }() @@ -66,7 +66,7 @@ func installRecovery() func(next http.Handler) http.Handler { if !setting.IsProd { store["ErrorMsg"] = combinedErr } - err = rnd.HTML(w, 500, "status/500", templates.BaseVars().Merge(store)) + err = rnd.HTML(w, http.StatusInternalServerError, "status/500", templates.BaseVars().Merge(store)) if err != nil { log.Error("%v", err) } -- cgit v1.2.3