use the minimum of configured session_livetime and session.gc_maxlifetime for session...

diff --git a/core/js/config.php b/core/js/config.php
index 2f423111bda473c5c69067a6c300a3d10ce16731..0ab74d2949e7b626b61c1794678106332ac9251b 100644 (file)
--- 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(),