diff options
| -rw-r--r-- | config/config.sample.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 9254365e3e2..dfa29f329c4 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -146,7 +146,7 @@ $CONFIG = array( "remember_login_cookie_lifetime" => 60*60*24*15, /* Life time of a session after inactivity */ -"session_life_time" => 60 * 60 * 12, +"session_lifetime" => 60 * 60 * 24, /* Custom CSP policy, changing this will overwrite the standard policy */ "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *", diff --git a/lib/base.php b/lib/base.php index 7097a376d6e..af54f439155 100644 --- a/lib/base.php +++ b/lib/base.php @@ -315,7 +315,7 @@ class OC { // regenerate session id periodically to avoid session fixation if (!self::$session->exists('SID_CREATED')) { self::$session->set('SID_CREATED', time()); - } else if (time() - self::$session->get('SID_CREATED') > $sessionLifeTime) { + } else if (time() - self::$session->get('SID_CREATED') > $sessionLifeTime / 2) { session_regenerate_id(true); self::$session->set('SID_CREATED', time()); } @@ -337,7 +337,7 @@ class OC { * @return int */ private static function getSessionLifeTime() { - return OC_Config::getValue('session_life_time', 60 * 60 * 12); + return OC_Config::getValue('session_lifetime', 60 * 60 * 24); } public static function getRouter() { |