Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

[Backport] Fix go1.15 lint error in modules/public/public.go (#12707) (#12708)

Browse source 
* fix go1.15 lint error in modules/public/public.go

* CI.restart()
This commit is contained in:
6543 2020-09-04 07:28:08 +02:00 committed by GitHub
parent 8a51c48eb6
commit 2806a312e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/public/public.go
View file

@ -6,6 +6,7 @@ package public
import ( import (
"encoding/base64" "encoding/base64"
"fmt"
"log" "log"
"net/http" "net/http"
"path" "path"
@ -159,7 +160,7 @@ func (opts *Options) handle(ctx *macaron.Context, log *log.Logger, opt *Options)
// Add an Expires header to the static content // Add an Expires header to the static content
if opt.ExpiresAfter > 0 { if opt.ExpiresAfter > 0 {
ctx.Resp.Header().Set("Expires", time.Now().Add(opt.ExpiresAfter).UTC().Format(http.TimeFormat)) ctx.Resp.Header().Set("Expires", time.Now().Add(opt.ExpiresAfter).UTC().Format(http.TimeFormat))
tag := GenerateETag(string(fi.Size()), fi.Name(), fi.ModTime().UTC().Format(http.TimeFormat)) tag := GenerateETag(fmt.Sprint(fi.Size()), fi.Name(), fi.ModTime().UTC().Format(http.TimeFormat))
ctx.Resp.Header().Set("ETag", tag) ctx.Resp.Header().Set("ETag", tag)
if ctx.Req.Header.Get("If-None-Match") == tag { if ctx.Req.Header.Get("If-None-Match") == tag {
ctx.Resp.WriteHeader(304) ctx.Resp.WriteHeader(304)