Skip to content

[stable31] debug: do not force delete "old" session data that still may be in use #56840

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

Draft
blizzz wants to merge 1 commit into
base: stable31
Choose a base branch
from
Draft

[stable31] debug: do not force delete "old" session data that still may be in use #56840

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions lib/private/Session/CryptoSessionData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected function initializeSession() {
'exception' => $e,
]);
$this->sessionValues = [];
$this->regenerateId(true, false);
$this->regenerateId(false, false);
}
}
}
Expand Down Expand Up @@ -172,7 +172,8 @@ public function reopen(): bool {
* @param bool $updateToken Wheater to update the associated auth token
* @return void
*/
public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false) {
public function regenerateId(bool $deleteOldSession = false, bool $updateToken = false) {
$deleteOldSession = false; // force it off intentionally
$this->session->regenerateId($deleteOldSession, $updateToken);
}

Expand Down
3 changes: 2 additions & 1 deletion lib/private/Session/Internal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public function close() {
* @param bool $updateToken Whether to update the associated auth token
* @return void
*/
public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false) {
public function regenerateId(bool $deleteOldSession = false, bool $updateToken = false) {
$deleteOldSession = false; // force it off intentionally
$this->reopen();
$oldId = null;

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Session/Memory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function clear() {
*
* @param bool $deleteOldSession
*/
public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false) {
public function regenerateId(bool $deleteOldSession = false, bool $updateToken = false) {
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/public/ISession.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function close();
* @return void
* @since 9.0.0, $updateToken added in 14.0.0
*/
public function regenerateId(bool $deleteOldSession = true, bool $updateToken = false);
public function regenerateId(bool $deleteOldSession = false, bool $updateToken = false);

/**
* Wrapper around session_id
Expand Down
Loading