ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix session related bugs.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-26 00:01:08 -05:00
parent d65ddb53a8
commit 429c9cee84
5 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
laravel/laravel.php
View File

@@ -113,21 +113,6 @@ require SYS_PATH.'routing/route'.EXT;
require SYS_PATH.'routing/router'.EXT;
require SYS_PATH.'routing/handler'.EXT;
// --------------------------------------------------------------
// Load the session.
// --------------------------------------------------------------
if (Config::get('session.driver') != '') Session\Manager::driver()->start(Cookie::get('laravel_session'));
// --------------------------------------------------------------
// Load the packages that are in the auto-loaded packages array.
// --------------------------------------------------------------
if (count(Config::get('application.packages')) > 0)
{
require SYS_PATH.'package'.EXT;
Package::load(Config::get('application.packages'));
}
// --------------------------------------------------------------
// Initialize the request instance for the request.
// --------------------------------------------------------------
@@ -140,6 +125,24 @@ IoC::container()->instance('laravel.request', $request);
// --------------------------------------------------------------
$request->input = new Input($request->method(), $request->is_spoofed(), $_GET, $_POST, $_FILES, new Cookie($_COOKIE));
// --------------------------------------------------------------
// Load the session.
// --------------------------------------------------------------
if (Config::get('session.driver') != '')
{
Session\Manager::driver()->start($request->input->cookies->get('laravel_session'));
}
// --------------------------------------------------------------
// Load the packages that are in the auto-loaded packages array.
// --------------------------------------------------------------
if (count(Config::get('application.packages')) > 0)
{
require SYS_PATH.'package'.EXT;
Package::load(Config::get('application.packages'));
}
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
@@ -161,7 +164,7 @@ if (Config::get('session.driver') != '')
$driver->flash('laravel_old_input', $request->input->get());
$driver->close();
$driver->close($request->input->cookies);
if ($driver instanceof Session\Sweeper and mt_rand(1, 100) <= 2)
{