mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-10 05:22:41 +00:00
Merging fixes to trunk
Revision: [1815] Adding the path.php require back, and removing the code that was in the path.php file. Revision: [1814] More work on Model. Removed all code from app/webroot/index.php that is moved to the bootstrap file. Added CAKE_SESSION_TIMEOUT define in app/config/core.php Revision: [1813] Adding a bootstrap file to remove need to edit index.php anymore git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1816 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
6d17d0d608
commit
9ca1ce91d8
10 changed files with 183 additions and 131 deletions
|
@ -126,7 +126,7 @@ class CakeSession extends Object
|
|||
}
|
||||
|
||||
$this->time = time();
|
||||
$this->sessionTime = $this->time + (Security::inactiveMins() * 60);
|
||||
$this->sessionTime = $this->time + (Security::inactiveMins() * CAKE_SESSION_TIMEOUT);
|
||||
$this->security = CAKE_SECURITY;
|
||||
$this->_initSession();
|
||||
$this->_begin();
|
||||
|
@ -370,7 +370,6 @@ class CakeSession extends Object
|
|||
ini_set('session.cookie_lifetime', $this->cookieLifeTime);
|
||||
ini_set('session.cookie_path', $this->path);
|
||||
ini_set('session.gc_probability', 1);
|
||||
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
|
||||
ini_set('session.auto_start', 0);
|
||||
ini_set('session.save_path', TMP.'sessions');
|
||||
break;
|
||||
|
@ -384,7 +383,6 @@ class CakeSession extends Object
|
|||
ini_set('session.cookie_lifetime', $this->cookieLifeTime);
|
||||
ini_set('session.cookie_path', $this->path);
|
||||
ini_set('session.gc_probability', 1);
|
||||
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
|
||||
ini_set('session.auto_start', 0);
|
||||
session_set_save_handler(array('CakeSession', '_open'),
|
||||
array('CakeSession', '_close'),
|
||||
|
@ -398,7 +396,6 @@ class CakeSession extends Object
|
|||
ini_set('session.cookie_lifetime', $this->cookieLifeTime);
|
||||
ini_set('session.cookie_path', $this->path);
|
||||
ini_set('session.gc_probability', 1);
|
||||
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
|
||||
break;
|
||||
default :
|
||||
$config = CONFIGS.CAKE_SESSION_SAVE.'.php';
|
||||
|
@ -412,7 +409,6 @@ class CakeSession extends Object
|
|||
ini_set('session.cookie_lifetime', $this->cookieLifeTime);
|
||||
ini_set('session.cookie_path', $this->path);
|
||||
ini_set('session.gc_probability', 1);
|
||||
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue