summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-01-12 11:33:44 +0100
committerGitHub <noreply@github.com>2018-01-12 11:33:44 +0100
commit61732c8b221a469db7483894c3669d6d167a8d08 (patch)
treeac55bda9109c3c525409322c944caadf4ea42aee /system/libraries
parentb862664f2ce2d20382b9af5bfa4dd036f5755409 (diff)
parent22b35fac103891034388d60f77ddd43ad94b535a (diff)
[ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcached
Fix of Session_memcached_driver::_get_lock
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Session/drivers/Session_memcached_driver.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index edabff52c..b109738c2 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -313,6 +313,8 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa
? $this->_memcached->add($this->_lock_key, time(), 300)
: FALSE;
}
+
+ return TRUE;
}
// 30 attempts to obtain a lock, in case another request already has it