Move setting of gc_maxlifetime to initSession

juliusknorr · juliusknorr · commit 1b43fbe06c7f · 2022-08-17T12:10:27.000+02:00
Signed-off-by: Julius Härtl &lt;jus@bitgrid.net&gt;
diff --git a/lib/base.php b/lib/base.php
@@ -445,7 +445,9 @@ public static function initSession() {
 			die();
 		}
 
+		//try to set the session lifetime
 		$sessionLifeTime = self::getSessionLifeTime();
+		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
 
 		// session timeout
 		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
@@ -717,9 +719,6 @@ public static function init() {
 				$config->deleteAppValue('core', 'cronErrors');
 			}
 		}
-		//try to set the session lifetime
-		$sessionLifeTime = self::getSessionLifeTime();
-		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
 
 		// User and Groups
 		if (!$systemConfig->getValue("installed", false)) {

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,9 @@ public static function initSession() {`
`445`	`445`	`die();`
`446`	`446`	`}`
`447`	`447`
	`448`	`+ //try to set the session lifetime`
`448`	`449`	`$sessionLifeTime = self::getSessionLifeTime();`
	`450`	`+ @ini_set('gc_maxlifetime', (string)$sessionLifeTime);`
`449`	`451`
`450`	`452`	`// session timeout`
`451`	`453`	`if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {`
`@@ -717,9 +719,6 @@ public static function init() {`
`717`	`719`	`$config->deleteAppValue('core', 'cronErrors');`
`718`	`720`	`}`
`719`	`721`	`}`
`720`		`- //try to set the session lifetime`
`721`		`- $sessionLifeTime = self::getSessionLifeTime();`
`722`		`- @ini_set('gc_maxlifetime', (string)$sessionLifeTime);`
`723`	`722`
`724`	`723`	`// User and Groups`
`725`	`724`	`if (!$systemConfig->getValue("installed", false)) {`