diff options
| author | 无闻 <u@gogs.io> | 2015-07-25 00:41:22 +0800 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-07-25 00:41:22 +0800 |
| commit | 3dcc0a4b5f89f3f5b6aa01f10d1ba44e8587ce72 (patch) | |
| tree | 86fd681f46f3b6e7ba28047ae83a25f1d195671b | |
| parent | 91ab2538c3e79bb3382e3f0e7cd46a080c3c084e (diff) | |
| parent | 81e6173356f94360217822b8104e6d3afac628b0 (diff) | |
| download | gitea-3dcc0a4b5f89f3f5b6aa01f10d1ba44e8587ce72.tar.gz gitea-3dcc0a4b5f89f3f5b6aa01f10d1ba44e8587ce72.zip | |
Merge pull request #1249 from donbowman/master
in routers/repo/download.go, don't set mime type, let go figure it out.
| -rw-r--r-- | modules/base/markdown.go | 2 | ||||
| -rw-r--r-- | routers/repo/download.go | 1 |
2 files changed, 1 insertions, 2 deletions
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 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") |