From ca4ca51c6a85cc60aaaa511be80daf8e2b8313fa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 18 Apr 2018 23:36:23 -0400 Subject: [PATCH 1/2] Add hostname prefix in MemcachedCacheDriver --- src/Core/Cache/MemcachedCacheDriver.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php index d6b8d4ad58..78a4a6bdfe 100644 --- a/src/Core/Cache/MemcachedCacheDriver.php +++ b/src/Core/Cache/MemcachedCacheDriver.php @@ -50,7 +50,7 @@ class MemcachedCacheDriver extends BaseObject implements ICacheDriver { // We store with the hostname as key to avoid problems with other applications return $this->memcached->set( - self::getApp()->get_hostname() . ":" . $key, + self::getApp()->get_hostname() . ':' . $key, $value, time() + $duration ); @@ -58,7 +58,9 @@ class MemcachedCacheDriver extends BaseObject implements ICacheDriver public function delete($key) { - return $this->memcached->delete($key); + $return = $this->memcached->delete(self::getApp()->get_hostname() . ':' . $key); + + return $return; } public function clear() From 87f638bdc90107bea511587368e2b3e1a4e40bcd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 18 Apr 2018 23:37:06 -0400 Subject: [PATCH 2/2] Improve CacheSessionhandler - Replace !x() by empty() - Add return values to read() and destroy() --- src/Core/Session/CacheSessionHandler.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Core/Session/CacheSessionHandler.php b/src/Core/Session/CacheSessionHandler.php index 463fd33d3e..507735c4fc 100644 --- a/src/Core/Session/CacheSessionHandler.php +++ b/src/Core/Session/CacheSessionHandler.php @@ -24,7 +24,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface public function read($session_id) { - if (!x($session_id)) { + if (empty($session_id)) { return ''; } @@ -58,9 +58,9 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface return true; } - Cache::set('session:' . $session_id, $session_data, Session::$expire); + $return = Cache::set('session:' . $session_id, $session_data, Session::$expire); - return true; + return $return; } public function close() @@ -70,8 +70,9 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface public function destroy($id) { - Cache::delete('session:' . $id); - return true; + $return = Cache::delete('session:' . $id); + + return $return; } public function gc($maxlifetime)