Merge pull request #270 from andreynering/gitea/http-headers-download
Fix HTTP headers for issue attachment downloadrelease/v1.15
commit
c664ffd1db
|
@ -336,11 +336,7 @@ func runWeb(ctx *cli.Context) error {
|
|||
}
|
||||
defer fr.Close()
|
||||
|
||||
ctx.Header().Set("Cache-Control", "public,max-age=86400")
|
||||
ctx.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
|
||||
// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
|
||||
// We must put the name in " manually.
|
||||
if err = repo.ServeData(ctx, "\""+attach.Name+"\"", fr); err != nil {
|
||||
if err = repo.ServeData(ctx, attach.Name, fr); err != nil {
|
||||
ctx.Handle(500, "ServeData", err)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -5,8 +5,9 @@
|
|||
package repo
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/git"
|
||||
|
||||
|
@ -22,14 +23,19 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
|
|||
buf = buf[:n]
|
||||
}
|
||||
|
||||
if !base.IsTextFile(buf) {
|
||||
if !base.IsImageFile(buf) {
|
||||
ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+path.Base(ctx.Repo.TreePath)+"\"")
|
||||
ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
|
||||
}
|
||||
} else if !ctx.QueryBool("render") {
|
||||
ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400")
|
||||
|
||||
// Google Chrome dislike commas in filenames, so let's change it to a space
|
||||
name = strings.Replace(name, ",", " ", -1)
|
||||
|
||||
if base.IsTextFile(buf) || ctx.QueryBool("render") {
|
||||
ctx.Resp.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
||||
} else if base.IsImageFile(buf) || base.IsPDFFile(buf) {
|
||||
ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name))
|
||||
} else {
|
||||
ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
|
||||
}
|
||||
|
||||
ctx.Resp.Write(buf)
|
||||
_, err := io.Copy(ctx.Resp, reader)
|
||||
return err
|
||||
|
|
Loading…
Reference in New Issue