summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-07-19 12:37:40 +0200
committerAndrey Andreev <narf@devilix.net>2016-07-19 12:37:40 +0200
commite12fcec770d7bc03f746c291e96cc75b51475f74 (patch)
tree8765ee0ed3df138a3557b5eb78e99ff73a11f498 /system
parentc20db3181733f701987d856f793f22b227d21762 (diff)
[ci skip] Fix an undefined index for 'timeout' in Redis session driver
http://forum.codeigniter.com/thread-64219.html
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Session/drivers/Session_redis_driver.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
index ad14cbfdc..d3a265958 100644
--- a/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -99,8 +99,9 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle
elseif (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(?<options>\?.+)?#', $this->_config['save_path'], $matches))
{
$save_path = array(
- 'host' => $matches[1],
- 'port' => empty($matches[2]) ? NULL : $matches[2]
+ 'host' => $matches[1],
+ 'port' => empty($matches[2]) ? NULL : $matches[2],
+ 'timeout' => NULL // We always pass this to Redis::connect(), so it needs to exist
);
}
else