routers/repo: set raw page content type to 'text/plain' #828

diff --git a/README.md b/README.md
index f85e7354faa5492f152abcd58a0f8c5d288a1179..226f2c877701687ecc88332921e47317d670b0c9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.
 
 - Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
 - Demo site [try.gogs.io](https://try.gogs.io) is running under `dev` branch.
+- If you think there are vulnerabilities in the project, please talk private to **u@gogs.io**, thanks!
 
 #### Other language version
 

diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index 38e4ddc274ed54a01670b56077a8560ad88eb4df..c848b05e33563002e67d8ae2772710f72e7a11e7 100644 (file)
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -1,6 +1,7 @@
 # This file lists all PUBLIC individuals having contributed content to the translation.
 # Order of name is meaningless.
 
+Christoph Kisfeld <christoph.kisfeld@gmail.com>
 Thomas Fanninger <gogs.thomas@fanninger.at>
 Łukasz Jan Niemier <lukasz@niemier.pl>
-Lafriks <lafriks@gmail.com>
\ No newline at end of file
+Lafriks <lafriks@gmail.com>

diff --git a/gogs.go b/gogs.go
index a3c749cea33006f300401d59efe713e28c1bd148..bdd3a8211c88aea2f09f362638e05b61e8ed92d7 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.12.0130 Beta"
+const APP_VER = "0.5.12.0131 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/routers/repo/download.go b/routers/repo/download.go
index 6367c40e28963f4d5080904bc8e8668b0814b352..c5e18e005b7a477a1f4340d14bf5934460361690 100644 (file)
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -25,16 +25,16 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
                buf = buf[:n]
        }
 
-       contentType, isTextFile := base.IsTextFile(buf)
+       _, isTextFile := base.IsTextFile(buf)
        _, isImageFile := base.IsImageFile(buf)
-       ctx.Resp.Header().Set("Content-Type", contentType)
+       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")
        }
        ctx.Resp.Write(buf)
-       io.Copy(ctx.Resp, dataRc)
-       return nil
+       _, err = io.Copy(ctx.Resp, dataRc)
+       return err
 }
 
 func SingleDownload(ctx *middleware.Context) {

diff --git a/templates/.VERSION b/templates/.VERSION
index 1674af9a21e508ad0341450cd5d3000e50f0567d..ab97c4a157283cbd6abd64039350b9d35d03f788 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.12.0130 Beta
\ No newline at end of file
+0.5.12.0131 Beta
\ No newline at end of file