From 423b1c69be7828c331a47467b66217d190e916b9 Mon Sep 17 00:00:00 2001 From: Don Bowman Date: Wed, 8 Apr 2015 00:44:38 +0000 Subject: [PATCH 1/2] don't set mime type to text/plain. This will break serving e.g. raw images, html, etc According to http://golang.org/pkg/net/http/#DetectContentType "If the Header does not contain a Content-Type line, Write adds a Content-Type set to the result of passing the initial 512 bytes of written data to DetectContentType." --- routers/repo/download.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/repo/download.go b/routers/repo/download.go index c5e18e005b..b1c5fbc84d 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -27,7 +27,6 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error { _, isTextFile := base.IsTextFile(buf) _, isImageFile := base.IsImageFile(buf) - ctx.Resp.Header().Set("Content-Type", "text/plain") if !isTextFile && !isImageFile { ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName)) ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary") From 81e6173356f94360217822b8104e6d3afac628b0 Mon Sep 17 00:00:00 2001 From: Don Bowman Date: Wed, 8 Apr 2015 22:25:47 +0000 Subject: [PATCH 2/2] remove blackfriday.EXTENSION_HARD_LINE_BREAK from options. --- modules/base/markdown.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/base/markdown.go b/modules/base/markdown.go index d06e1338e7..e860f9705c 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -198,7 +198,7 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte { extensions |= blackfriday.EXTENSION_FENCED_CODE extensions |= blackfriday.EXTENSION_AUTOLINK extensions |= blackfriday.EXTENSION_STRIKETHROUGH - extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK + //extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK extensions |= blackfriday.EXTENSION_SPACE_HEADERS extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK