forks/forgejo
1
0
Fork 0
Code Releases Activity

fix serve attachment content type

Browse source
This commit is contained in:
Unknwon 2015-08-12 04:49:51 +08:00
parent cafde1287e
commit e67659bf8e
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/web.go
View file

@ -338,9 +338,19 @@ func runWeb(ctx *cli.Context) {
return
}
fr, err := os.Open(attach.LocalPath())
if err != nil {
ctx.Handle(500, "Open", err)
return
}
defer fr.Close()
// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
// We must put the name in " manually.
ctx.ServeFileContent(attach.LocalPath(), "\""+attach.Name+"\"")
if err = repo.ServeData(ctx, "\""+attach.Name+"\"", fr); err != nil {
ctx.Handle(500, "ServeData", err)
return
}
})
m.Post("/issues/attachments", repo.UploadIssueAttachment)
}, ignSignIn)

20
routers/repo/download.go
View file

@ -13,14 +13,9 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
dataRc, err := blob.Data()
if err != nil {
return err
}
func ServeData(ctx *middleware.Context, name string, reader io.Reader) error {
buf := make([]byte, 1024)
n, _ := dataRc.Read(buf)
n, _ := reader.Read(buf)
if n > 0 {
buf = buf[:n]
}
@ -39,10 +34,19 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
}
}
ctx.Resp.Write(buf)
_, err = io.Copy(ctx.Resp, dataRc)
_, err := io.Copy(ctx.Resp, reader)
return err
}
func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
dataRc, err := blob.Data()
if err != nil {
return err
}
return ServeData(ctx, ctx.Repo.TreeName, dataRc)
}
func SingleDownload(ctx *middleware.Context) {
blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreeName)
if err != nil {