diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:09:52 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:09:52 +0100 |
| commit | 38b08116c61c0a68e6d350c986f75589220692ed (patch) | |
| tree | fa8a9b5a0f0be955d42110b67037d1ff46e54604 /system/libraries/Session/drivers/Session_memcached_driver.php | |
| parent | 34251bfec2627fb0526d5f99f3a13a3d8a4506d8 (diff) | |
| parent | fd5fe1a64c03ae7204a7e72d936215f7a61d8c30 (diff) | |
Merge branch '3.0-stable' into develop
Resolved conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
Diffstat (limited to 'system/libraries/Session/drivers/Session_memcached_driver.php')
| -rw-r--r-- | system/libraries/Session/drivers/Session_memcached_driver.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php index 760239dfb..9d7ab1172 100644 --- a/system/libraries/Session/drivers/Session_memcached_driver.php +++ b/system/libraries/Session/drivers/Session_memcached_driver.php @@ -300,7 +300,10 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa */ protected function _get_lock($session_id) { - if (isset($this->_lock_key)) + // PHP 7 reuses the SessionHandler object on regeneration, + // so we need to check here if the lock key is for the + // correct session ID. + if ($this->_lock_key === $this->_key_prefix.$session_id.':lock') { return ($this->_memcached->replace($this->_lock_key, time(), 300)) ? $this->_success |