use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation

11 years ago · 764e695cb6
parent 1173a55ddb
commit 764e695cb6
1 changed files with 1 additions and 1 deletions
--- 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(),