From 764e695cb65e4b11edfc1357c2b8adf95dc069c0 Mon Sep 17 00:00:00 2001 From: Matthias Rieber Date: Tue, 15 Jul 2014 22:04:31 +0200 Subject: [PATCH] use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation --- core/js/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/config.php b/core/js/config.php index 2f423111bda..0ab74d2949e 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -70,7 +70,7 @@ $array = array( "firstDay" => json_encode($l->l('firstday', 'firstday')) , "oc_config" => json_encode( array( - 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), + 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')), 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true), 'version' => implode('.', OC_Util::getVersion()), 'versionstring' => OC_Util::getVersionString(),