From 4a01bb8fa40e770433b6858a97e336393cb8e9b2 Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Sun, 21 Sep 2014 12:19:50 -0400
Subject: [PATCH] Mirror bug fix

---
 .travis.yml                | 3 +--
 README.md                  | 2 +-
 README_ZH.md               | 2 +-
 cmd/web.go                 | 7 +++----
 gogs.go                    | 2 +-
 modules/setting/setting.go | 1 -
 templates/.VERSION         | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2600693b6..eb5732ff6 100644
--- 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 08eed1348..232aa92a8 100644
--- 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 4f59e0018..fcc8b4969 100644
--- 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 83dfca4e6..45f35a35a 100644
--- 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 8f9bc767d..645e4e339 100644
--- 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 a1ab43d02..321282df2 100644
--- 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 9df945b78..4e0c5d610 100644
--- 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