From: Don Bowman <don.waterloo@gmail.com>
Date: Thu, 13 Aug 2015 23:15:55 +0000 (+0000)
Subject: 43bfee0d4872932c1da185e8367e21795bc4ceb5 reverted my change
X-Git-Tag: v0.9.99~1247^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4137426c8836686f06e6de21e7c586df3e798c3a;p=gitea.git

43bfee0d4872932c1da185e8367e21795bc4ceb5 reverted my change
423b1c69be7828c331a47467b66217d190e916b9, which in turn
causes all content to be served as text/plain. Let go decide
what the mime type is (e.g. text/html instead of text/plain).
---

diff --git a/routers/repo/download.go b/routers/repo/download.go
index c71f8d293e..a73ecb37e2 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -26,12 +26,7 @@ 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 {
+	if ! isTextFile {
 		_, isImageFile := base.IsImageFile(buf)
 		if !isImageFile {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))