bug #34827 [HttpFoundation] get currently session.gc_maxlifetime if ttl doesnt exists (rafaeltovar)

nicolas-grekas · nicolas-grekas · commit 0ad5dd5f73af · 2019-12-06T10:28:45.000+01:00
This PR was submitted for the master branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- [HttpFoundation] get currently session.gc_maxlifetime if ttl doesnt exists | Q | A | ------------- | --- | Branch? | master / 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34659 | License | MIT If option `ttl` was not defined in RedisSessionHandler, this got the default `session.gc_maxlifetime`. With this fixed, RedisSessionHandler get the currently `session.gc_maxlifetime`. Commits ------- b6253e2 [HttpFoundation] get currently session.gc_maxlifetime if ttl doesnt exists
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -63,7 +63,7 @@ public function __construct($redis, array $options = [])
 
         $this->redis = $redis;
         $this->prefix = $options['prefix'] ?? 'sf_s';
-        $this->ttl = $options['ttl'] ?? (int) ini_get('session.gc_maxlifetime');
+        $this->ttl = $options['ttl'] ?? null;
     }
 
     /**
@@ -79,7 +79,7 @@ protected function doRead($sessionId): string
      */
     protected function doWrite($sessionId, $data): bool
     {
-        $result = $this->redis->setEx($this->prefix.$sessionId, $this->ttl, $data);
+        $result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')), $data);
 
         return $result && !$result instanceof ErrorInterface;
     }
@@ -115,6 +115,6 @@ public function gc($maxlifetime): bool
      */
     public function updateTimestamp($sessionId, $data)
     {
-        return (bool) $this->redis->expire($this->prefix.$sessionId, $this->ttl);
+        return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct($redis, array $options = [])`
`63`	`63`
`64`	`64`	`$this->redis = $redis;`
`65`	`65`	`$this->prefix = $options['prefix'] ?? 'sf_s';`
`66`		`- $this->ttl = $options['ttl'] ?? (int) ini_get('session.gc_maxlifetime');`
	`66`	`+ $this->ttl = $options['ttl'] ?? null;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`@@ -79,7 +79,7 @@ protected function doRead($sessionId): string`
`79`	`79`	`*/`
`80`	`80`	`protected function doWrite($sessionId, $data): bool`
`81`	`81`	`{`
`82`		`- $result = $this->redis->setEx($this->prefix.$sessionId, $this->ttl, $data);`
	`82`	`+ $result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')), $data);`
`83`	`83`
`84`	`84`	`return $result && !$result instanceof ErrorInterface;`
`85`	`85`	`}`
`@@ -115,6 +115,6 @@ public function gc($maxlifetime): bool`
`115`	`115`	`*/`
`116`	`116`	`public function updateTimestamp($sessionId, $data)`
`117`	`117`	`{`
`118`		`- return (bool) $this->redis->expire($this->prefix.$sessionId, $this->ttl);`
	`118`	`+ return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));`
`119`	`119`	`}`
`120`	`120`	`}`