From 2bc70f62ce98c1fe0fcbf03478507d9995220114 Mon Sep 17 00:00:00 2001 From: "asta.xie" Date: Sat, 22 Feb 2014 01:04:47 +0800 Subject: [PATCH] delete MaxAge cookielifeTime replace --- session/session.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/session/session.go b/session/session.go index d1a44538..bc8832b0 100644 --- a/session/session.go +++ b/session/session.go @@ -56,11 +56,10 @@ type managerConfig struct { EnableSetCookie bool `json:"enableSetCookie,omitempty"` Gclifetime int64 `json:"gclifetime"` Maxlifetime int64 `json:"maxLifetime"` - Maxage int `json:"maxage"` Secure bool `json:"secure"` SessionIDHashFunc string `json:"sessionIDHashFunc"` SessionIDHashKey string `json:"sessionIDHashKey"` - CookieLifeTime int64 `json:"cookieLifeTime"` + CookieLifeTime int `json:"cookieLifeTime"` ProviderConfig string `json:"providerConfig"` } @@ -125,8 +124,8 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Path: "/", HttpOnly: true, Secure: manager.config.Secure} - if manager.config.Maxage >= 0 { - cookie.MaxAge = manager.config.Maxage + if manager.config.CookieLifeTime >= 0 { + cookie.MaxAge = manager.config.CookieLifeTime } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -144,8 +143,8 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Path: "/", HttpOnly: true, Secure: manager.config.Secure} - if manager.config.Maxage >= 0 { - cookie.MaxAge = manager.config.Maxage + if manager.config.CookieLifeTime >= 0 { + cookie.MaxAge = manager.config.CookieLifeTime } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -206,8 +205,8 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque cookie.HttpOnly = true cookie.Path = "/" } - if manager.config.Maxage >= 0 { - cookie.MaxAge = manager.config.Maxage + if manager.config.CookieLifeTime >= 0 { + cookie.MaxAge = manager.config.CookieLifeTime } http.SetCookie(w, cookie) r.AddCookie(cookie)