Merge pull request #15 from pbowyer/patch-2

Tom Boutell · web-flow · commit 067c22944ca2 · 2018-12-10T10:59:19.000-05:00
Prevent "Warning: ini_set(): A session is active. You cannot change t…
diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php
@@ -252,7 +252,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o
     }
 
     // force the max lifetime for session garbage collector to be greater than timeout
-    if (ini_get('session.gc_maxlifetime') < $this->options['timeout'])
+    if (session_status() !== PHP_SESSION_ACTIVE && ini_get('session.gc_maxlifetime') < $this->options['timeout'])
     {
       ini_set('session.gc_maxlifetime', $this->options['timeout']);
     }

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`// force the max lifetime for session garbage collector to be greater than timeout`
`255`		`- if (ini_get('session.gc_maxlifetime') < $this->options['timeout'])`
	`255`	`+ if (session_status() !== PHP_SESSION_ACTIVE && ini_get('session.gc_maxlifetime') < $this->options['timeout'])`
`256`	`256`	`{`
`257`	`257`	`ini_set('session.gc_maxlifetime', $this->options['timeout']);`
`258`	`258`	`}`