linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Raw text file view returns correct charset in content-type header if not utf-8

Browse Source
This commit is contained in:
Vladimir Vissoultchev 2015-07-28 19:50:35 +03:00
parent fac4e27882
commit 43bfee0d48
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
routers/repo/download.go
View File

@ -26,11 +26,18 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
}
_, isTextFile := base.IsTextFile(buf)
if isTextFile {
charset, _ := base.DetectEncoding(buf)
if charset != "utf-8" {
ctx.Resp.Header().Set("Content-Type", "text/plain; charset="+charset)
}
} else {
_, isImageFile := base.IsImageFile(buf)
if !isTextFile && !isImageFile {
if !isImageFile {
ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
}
}
ctx.Resp.Write(buf)
_, err = io.Copy(ctx.Resp, dataRc)
return err