Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

1 files changed, 11 insertions, 4 deletions

diff --git a/routers/repo/download.go b/routers/repo/download.go
index b1c5fbc8..c71f8d29 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)