diff options
Diffstat (limited to 'routers/routes')
| -rw-r--r-- | routers/routes/routes.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/routers/routes/routes.go b/routers/routes/routes.go index ec57e8f5fd..c81d56064c 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -181,12 +181,13 @@ func NewMacaron() *macaron.Macaron { } m.Use(i18n.I18n(i18n.Options{ - SubURL: setting.AppSubURL, - Files: localFiles, - Langs: setting.Langs, - Names: setting.Names, - DefaultLang: "en-US", - Redirect: false, + SubURL: setting.AppSubURL, + Files: localFiles, + Langs: setting.Langs, + Names: setting.Names, + DefaultLang: "en-US", + Redirect: false, + CookieDomain: setting.SessionConfig.Domain, })) m.Use(cache.Cacher(cache.Options{ Adapter: setting.CacheService.Adapter, @@ -202,8 +203,9 @@ func NewMacaron() *macaron.Macaron { Cookie: setting.CSRFCookieName, SetCookie: true, Secure: setting.SessionConfig.Secure, - CookieHttpOnly: true, + CookieHttpOnly: setting.CSRFCookieHTTPOnly, Header: "X-Csrf-Token", + CookieDomain: setting.SessionConfig.Domain, CookiePath: setting.AppSubURL, })) m.Use(toolbox.Toolboxer(m, toolbox.Options{ |