mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-06 22:33:14 +00:00
Add Cache-Control to avatar redirects (#16973)
* Add Cache-Control to avatar redirects This does seem to do the trick to make the Avatar redirects cachable in Chrome. In Firefox, it does not seem to work, thought and I found no way to suppress the requests to the original URLs, I even tried setting an Etag to no avail. Related discussion in https://github.com/go-gitea/gitea/issues/16964. Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
parent
cf6d398485
commit
9fa6bdb64e
1 changed files with 9 additions and 3 deletions
|
@ -13,10 +13,16 @@ import (
|
||||||
|
|
||||||
"code.gitea.io/gitea/models"
|
"code.gitea.io/gitea/models"
|
||||||
"code.gitea.io/gitea/modules/context"
|
"code.gitea.io/gitea/modules/context"
|
||||||
|
"code.gitea.io/gitea/modules/httpcache"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func cacheableRedirect(ctx *context.Context, location string) {
|
||||||
|
ctx.Resp.Header().Set("Cache-Control", httpcache.GetCacheControl())
|
||||||
|
ctx.Redirect(location)
|
||||||
|
}
|
||||||
|
|
||||||
// Avatar redirect browser to user avatar of requested size
|
// Avatar redirect browser to user avatar of requested size
|
||||||
func Avatar(ctx *context.Context) {
|
func Avatar(ctx *context.Context) {
|
||||||
userName := ctx.Params(":username")
|
userName := ctx.Params(":username")
|
||||||
|
@ -43,7 +49,7 @@ func Avatar(ctx *context.Context) {
|
||||||
user = models.NewGhostUser()
|
user = models.NewGhostUser()
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.Redirect(user.RealSizedAvatarLink(size))
|
cacheableRedirect(ctx, user.RealSizedAvatarLink(size))
|
||||||
}
|
}
|
||||||
|
|
||||||
// AvatarByEmailHash redirects the browser to the appropriate Avatar link
|
// AvatarByEmailHash redirects the browser to the appropriate Avatar link
|
||||||
|
@ -63,7 +69,7 @@ func AvatarByEmailHash(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if len(email) == 0 {
|
if len(email) == 0 {
|
||||||
ctx.Redirect(models.DefaultAvatarLink())
|
cacheableRedirect(ctx, models.DefaultAvatarLink())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
size := ctx.FormInt("size")
|
size := ctx.FormInt("size")
|
||||||
|
@ -94,5 +100,5 @@ func AvatarByEmailHash(ctx *context.Context) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.Redirect(models.MakeFinalAvatarURL(avatarURL, size))
|
cacheableRedirect(ctx, models.MakeFinalAvatarURL(avatarURL, size))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue