diff options
| author | Matthias Rieber <matthias@zu-con.org> | 2014-07-15 22:04:31 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-21 15:39:46 +0200 |
| commit | 764e695cb65e4b11edfc1357c2b8adf95dc069c0 (patch) | |
| tree | e380058f8e0fb01e960e1780c8890961ce0bae5a /core/js | |
| parent | 1173a55ddba46b44bbb1e8a34e78d5d59522a4c8 (diff) | |
| download | nextcloud-server-764e695cb65e4b11edfc1357c2b8adf95dc069c0.tar.gz nextcloud-server-764e695cb65e4b11edfc1357c2b8adf95dc069c0.zip | |
use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
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(), |