Merge pull request #133 from LeaseWeb/master

Removed session locking on write, added unlock on destroy
snc · Apr 18, 2014 · 6503cfc · 6503cfc
2 parents 52549ac + d3d1fce
commit 6503cfc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/Session/Storage/Handler/RedisSessionHandler.php b/Session/Storage/Handler/RedisSessionHandler.php
@@ -157,14 +157,6 @@ public function read($sessionId)
      */
     public function write($sessionId, $data)
     {
-        if ($this->locking) {
-            if (!$this->locked) {
-                if (!$this->lockSession($sessionId)) {
-                    return false;
-                }
-            }
-        }
-
         if (0 < $this->ttl) {
             $this->redis->setex($this->getRedisKey($sessionId), $this->ttl, $data);
         } else {
@@ -178,6 +170,7 @@ public function write($sessionId, $data)
     public function destroy($sessionId)
     {
         $this->redis->del($this->getRedisKey($sessionId));
+        $this->close();
 
         return true;
     }

diff --git a/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -101,6 +101,6 @@ public function testSessionLocking()
         ;
 
         $handler = new RedisSessionHandler($this->redis, array(), 'session', true, 1000000);
-        $handler->write('_symfony', 'some data');
+        $handler->read('_symfony');
     }
 }