summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-01-12 11:33:44 +0100
committerAndrey Andreev <narf@devilix.net>2018-01-12 11:34:37 +0100
commit615f3d9ddd01e2023016b5e72ba9efac6ee1b107 (patch)
tree0817c35a8a80984956db2e4d0b0eddb8be871ccc
parentcce6bd170f24cf0f10ca0b58150d0324433a66be (diff)
[ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcached
Fix of Session_memcached_driver::_get_lock
-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