summaryrefslogtreecommitdiffstats
path: root/vendor/gitea.com/macaron/session/mysql/mysql.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/gitea.com/macaron/session/mysql/mysql.go')
-rw-r--r--vendor/gitea.com/macaron/session/mysql/mysql.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/vendor/gitea.com/macaron/session/mysql/mysql.go b/vendor/gitea.com/macaron/session/mysql/mysql.go
index da5079b24a..af1cd9dd1b 100644
--- a/vendor/gitea.com/macaron/session/mysql/mysql.go
+++ b/vendor/gitea.com/macaron/session/mysql/mysql.go
@@ -120,18 +120,20 @@ func (p *MysqlProvider) Init(expire int64, connStr string) (err error) {
// Read returns raw session store by session ID.
func (p *MysqlProvider) Read(sid string) (session.RawStore, error) {
+ now := time.Now().Unix()
var data []byte
- err := p.c.QueryRow("SELECT data FROM session WHERE `key`=?", sid).Scan(&data)
+ expiry := now
+ err := p.c.QueryRow("SELECT data, expiry FROM session WHERE `key`=?", sid).Scan(&data, &expiry)
if err == sql.ErrNoRows {
_, err = p.c.Exec("INSERT INTO session(`key`,data,expiry) VALUES(?,?,?)",
- sid, "", time.Now().Unix())
+ sid, "", now)
}
if err != nil {
return nil, err
}
var kv map[interface{}]interface{}
- if len(data) == 0 {
+ if len(data) == 0 || expiry+p.expire <= now {
kv = make(map[interface{}]interface{})
} else {
kv, err = session.DecodeGob(data)