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

tokarchuk/v1.17
Vladimir Vissoultchev 9 years ago
parent fac4e27882
commit 43bfee0d48
  1. 9
      routers/repo/download.go

@ -26,11 +26,18 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
} }
_, isTextFile := base.IsTextFile(buf) _, 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) _, 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-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary") ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
} }
}
ctx.Resp.Write(buf) ctx.Resp.Write(buf)
_, err = io.Copy(ctx.Resp, dataRc) _, err = io.Copy(ctx.Resp, dataRc)
return err return err

Loading…
Cancel
Save