Mirror bug fix

diff --git a/.travis.yml b/.travis.yml
index 2600693b63543ffd02d3f1ae1d00910c025a5227..eb5732ff6089dc550416cc07ccd3ec22786d86cc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,4 @@ language: go
 
 go:
   - 1.2
-  - 1.3
-  - tip
\ No newline at end of file
+  - 1.3
\ No newline at end of file

diff --git a/README.md b/README.md
index 08eed1348fef7d6d617550d7ee4595465ec2b3ec..232aa92a84d91334fec537557a6b058bf2fd8e63 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.
 
 ![Demo](https://gowalker.org/public/gogs_demo.gif)
 
-##### Current version: 0.5.2 Beta
+##### Current version: 0.5.3 Beta
 
 ### NOTICES
 

diff --git a/README_ZH.md b/README_ZH.md
index 4f59e0018708d4b1fa67e830b7177481ce2c9da6..fcc8b496946c6ce81d065f10f36f9734d7c9af10 100644 (file)
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。
 
 ![Demo](https://gowalker.org/public/gogs_demo.gif)
 
-##### 当前版本：0.5.2 Beta
+##### 当前版本：0.5.3 Beta
 
 ## 开发目的
 

diff --git a/cmd/web.go b/cmd/web.go
index 83dfca4e6716ac7df1260433fa1f34fbf4a38027..45f35a35afeb3163e3ee212116b6f6f975294bd6 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -97,10 +97,9 @@ func newMacaron() *macaron.Macaron {
                Config:   *setting.SessionConfig,
        }))
        m.Use(csrf.Generate(csrf.Options{
-               Secret:     setting.SecretKey,
-               SetCookie:  true,
-               Header:     "X-Csrf-Token",
-               CookiePath: setting.AppSubUrl,
+               Secret:    setting.SecretKey,
+               SetCookie: true,
+               Header:    "X-Csrf-Token",
        }))
        m.Use(toolbox.Toolboxer(m, toolbox.Options{
                HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{

diff --git a/gogs.go b/gogs.go
index 8f9bc767d93e96760bed2a0e53c8f459d48e513d..645e4e3398e44f4706f801f195d4bf3c880a43e8 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.3.0919 Beta"
+const APP_VER = "0.5.3.0921 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index a1ab43d0222cf2812cd0df98f988e25adf3cb9d9..321282df25e4d68bf6a81b949ea93e8b117b873d 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -380,7 +380,6 @@ func newSessionService() {
        SessionConfig = new(session.Config)
        SessionConfig.ProviderConfig = strings.Trim(Cfg.MustValue("session", "PROVIDER_CONFIG"), "\" ")
        SessionConfig.CookieName = Cfg.MustValue("session", "COOKIE_NAME", "i_like_gogits")
-       SessionConfig.CookiePath = AppSubUrl
        SessionConfig.Secure = Cfg.MustBool("session", "COOKIE_SECURE")
        SessionConfig.EnableSetCookie = Cfg.MustBool("session", "ENABLE_SET_COOKIE", true)
        SessionConfig.Gclifetime = Cfg.MustInt64("session", "GC_INTERVAL_TIME", 86400)

diff --git a/templates/.VERSION b/templates/.VERSION
index 9df945b78309b6d27d47a53498a15a5237445c5e..4e0c5d6102fa406bb0faff957d05a129ce97d3b4 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.3.0919 Beta
\ No newline at end of file
+0.5.3.0921 Beta
\ No newline at end of file