diff options
| author | Vladimir Vissoultchev <wqweto@gmail.com> | 2015-07-28 19:50:35 +0300 |
|---|---|---|
| committer | Vladimir Vissoultchev <wqweto@gmail.com> | 2015-07-28 19:50:35 +0300 |
| commit | 43bfee0d4872932c1da185e8367e21795bc4ceb5 (patch) | |
| tree | 1a5c7637f864d420706c3340c70aa5d1dec835f1 /routers/repo | |
| parent | fac4e27882f412faf3ddf8661bdba76732a35292 (diff) | |
| download | gitea-43bfee0d4872932c1da185e8367e21795bc4ceb5.tar.gz gitea-43bfee0d4872932c1da185e8367e21795bc4ceb5.zip | |
Raw text file view returns correct charset in content-type header if not utf-8
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/download.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/routers/repo/download.go b/routers/repo/download.go index b1c5fbc84d..8e9efba31b 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -26,10 +26,17 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error { } _, isTextFile := base.IsTextFile(buf) - _, isImageFile := base.IsImageFile(buf) - if !isTextFile && !isImageFile { - ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName)) - ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary") + 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 !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) |