#2748 fix redirect loop with auto-signin

unknwon · unknwon · commit f6759a731a06 · 2016-03-04T09:15:11.000-05:00
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.8.53
+##### Current version: 0.8.54
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
diff --git a/gogs.go b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.8.53.0303"
+const APP_VER = "0.8.54.0304"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
@@ -113,7 +113,8 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 		if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&
 			len(ctx.GetCookie(setting.CookieUserName)) > 0 {
 			ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
-			ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI)
+			ctx.Redirect(setting.AppSubUrl + "/user/login")
+			return
 		}
 
 		if options.AdminRequire {
diff --git a/templates/.VERSION b/templates/.VERSION
@@ -1 +1 @@
-0.8.53.0303
+0.8.54.0304

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/gogits/gogs/modules/setting"`
`18`	`18`	`)`
`19`	`19`
`20`		`-const APP_VER = "0.8.53.0303"`
	`20`	`+const APP_VER = "0.8.54.0304"`
`21`	`21`
`22`	`22`	`func init() {`
`23`	`23`	`runtime.GOMAXPROCS(runtime.NumCPU())`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ func Toggle(options *ToggleOptions) macaron.Handler {`
`113`	`113`	`if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&`
`114`	`114`	`len(ctx.GetCookie(setting.CookieUserName)) > 0 {`
`115`	`115`	`ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)`
`116`		`- ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI)`
	`116`	`+ ctx.Redirect(setting.AppSubUrl + "/user/login")`
	`117`	`+ return`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`if options.AdminRequire {`