summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session/drivers/Session_database_driver.php
diff options
context:
space:
mode:
authorHeesung Ahn <ahn.heesung@gmail.com>2015-03-05 16:49:11 +0100
committerHeesung Ahn <ahn.heesung@gmail.com>2015-03-05 16:49:11 +0100
commit7b0e60b085e35363bd9ab9150f62227f74711f2a (patch)
treee30dd7f4171c83e19a32d197a078f6a1daf0d658 /system/libraries/Session/drivers/Session_database_driver.php
parent4b25348e06a7587c64b97811208352c5c9478ab8 (diff)
parent137aa20e0b0fd71ff8f672c57c07c4972c91c6a4 (diff)
Merge origin/develop into CI_Security_test
Diffstat (limited to 'system/libraries/Session/drivers/Session_database_driver.php')
-rw-r--r--system/libraries/Session/drivers/Session_database_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php
index f496b4fe0..76c1cf34e 100644
--- a/system/libraries/Session/drivers/Session_database_driver.php
+++ b/system/libraries/Session/drivers/Session_database_driver.php
@@ -319,7 +319,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
if ($this->_platform === 'mysql')
{
$arg = $session_id.($this->_config['match_ip'] ? '_'.$_SERVER['REMOTE_ADDR'] : '');
- if ($this->_db->query("SELECT GET_LOCK('".$arg."', 10) AS ci_session_lock")->row()->ci_session_lock)
+ if ($this->_db->query("SELECT GET_LOCK('".$arg."', 300) AS ci_session_lock")->row()->ci_session_lock)
{
$this->_lock = $arg;
return TRUE;