summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-27 07:05:19 -0800
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-27 07:05:19 -0800
commit5fd8d155fd8ebdffeb03ed6720f3ae31af117827 (patch)
tree54dc013d94e5b7dd0ba7e7336e56c0cc89bc98d6 /lib
parentfd654e9c2f9b68df71c1c4525af233b53a1e07da (diff)
parent888e4f21d25d9608cee9507d669637946755bb57 (diff)
downloadnextcloud-server-5fd8d155fd8ebdffeb03ed6720f3ae31af117827.tar.gz
nextcloud-server-5fd8d155fd8ebdffeb03ed6720f3ae31af117827.zip
Merge pull request #1962 from owncloud/big_upload_fix
timeout after a longer time
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index 8d6dec78ea6..0e751c0f0ec 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -340,13 +340,13 @@ class OC {
// regenerate session id periodically to avoid session fixation
if (!isset($_SESSION['SID_CREATED'])) {
$_SESSION['SID_CREATED'] = time();
- } else if (time() - $_SESSION['SID_CREATED'] > 900) {
+ } else if (time() - $_SESSION['SID_CREATED'] > 60*60*12) {
session_regenerate_id(true);
$_SESSION['SID_CREATED'] = time();
}
// session timeout
- if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+ if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time() - 42000, '/');
}