Skip to content

[5.0] Do not call terminate method if handle method not called in StartSession middleware #7058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taylorotwell merged 1 commit into from
Jan 21, 2015
Merged

[5.0] Do not call terminate method if handle method not called in StartSession middleware #7058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Illuminate/Session/Middleware/StartSession.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ class StartSession implements MiddlewareContract, TerminableMiddleware {
*/
protected $manager;

/**
* True if handle method called
Copy link
Collaborator

@GrahamCampbell GrahamCampbell Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing fullstop and the description is rubbish

* @var bool
Copy link
Collaborator

@GrahamCampbell GrahamCampbell Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need an extra line of comment here

*/
protected $sessionHandled = false;

/**
* Create a new session middleware.
*
Expand All @@ -40,6 +46,7 @@ public function __construct(SessionManager $manager)
*/
public function handle($request, Closure $next)
{
$this->sessionHandled = true;
// If a session driver has been configured, we will need to start the session here
// so that the data is ready for an application. Note that the Laravel sessions
// do not make use of PHP "native" sessions in any way since they are crappy.
Expand Down Expand Up @@ -76,7 +83,7 @@ public function handle($request, Closure $next)
*/
public function terminate($request, $response)
{
if ($this->sessionConfigured() && ! $this->usingCookieSessions())
if ($this->sessionHandled && $this->sessionConfigured() && ! $this->usingCookieSessions())
{
$this->manager->driver()->save();
}
Expand Down