diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2022-11-17 18:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-18 01:55:15 +0800 |
| commit | 43ab9324c579a393f778d6842c577a872d0e4265 (patch) | |
| tree | 0895b0e0e6d7e4182fd193459d0ac3ee0a30fb40 /routers/web | |
| parent | c144942b23eb6e05a60526cc6d2b88b488ca75dd (diff) | |
| download | gitea-43ab9324c579a393f778d6842c577a872d0e4265.tar.gz gitea-43ab9324c579a393f778d6842c577a872d0e4265.zip | |
Fix setting HTTP headers after write (#21833)
The headers can't be modified after it was send to the client.
Diffstat (limited to 'routers/web')
| -rw-r--r-- | routers/web/feed/profile.go | 2 | ||||
| -rw-r--r-- | routers/web/web.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 0e11f210ce..ffa34572bc 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -5,7 +5,6 @@ package feed import ( - "net/http" "time" activities_model "code.gitea.io/gitea/models/activities" @@ -59,7 +58,6 @@ func showUserFeed(ctx *context.Context, formatType string) { // writeFeed write a feeds.Feed as atom or rss to ctx.Resp func writeFeed(ctx *context.Context, feed *feeds.Feed, formatType string) { - ctx.Resp.WriteHeader(http.StatusOK) if formatType == "atom" { ctx.Resp.Header().Set("Content-Type", "application/atom+xml;charset=utf-8") if err := feed.WriteAtom(ctx.Resp); err != nil { diff --git a/routers/web/web.go b/routers/web/web.go index d0ee9c5eac..5fefbad88a 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -604,7 +604,10 @@ func RegisterRoutes(m *web.Route) { m.Group("", func() { m.Get("/favicon.ico", func(ctx *context.Context) { - ctx.ServeFile(path.Join(setting.StaticRootPath, "public/img/favicon.png")) + ctx.SetServeHeaders(&context.ServeHeaderOptions{ + Filename: "favicon.png", + }) + http.ServeFile(ctx.Resp, ctx.Req, path.Join(setting.StaticRootPath, "public/img/favicon.png")) }) m.Group("/{username}", func() { m.Get(".png", func(ctx *context.Context) { ctx.Error(http.StatusNotFound) }) |