Properly initialize PS(mod) on RINIT #6795
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We can't do that in `php_rinit_session_globals()` since that function is called by PHP function `session_destroy()` too, but in that case we don't want to reset PS(mod).
nikic
reviewed
Mar 22, 2021
| @@ -2856,7 +2856,8 @@ static int php_rinit_session(zend_bool auto_start) /* {{{ */ | |||
| { | |||
| php_rinit_session_globals(); | |||
|
|
|||
| if (PS(mod) == NULL) { | |||
| PS(mod) = NULL; | |||
There was a problem hiding this comment.
Do we need to also do this for PS(serializer) below?
There was a problem hiding this comment.
That's not necessary, since OnUpdateSerializer handles this (any unknown handler will set it to NULL). OnUpdateSaveHandler doesn't do this for user handlers (these are special, since they can only work for session_set_save_handler().
nikic
approved these changes
Mar 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We can't do that in
php_rinit_session_globals()since that functionis called by PHP function
session_destroy()too, but in that case wedon't want to reset PS(mod).
This fixes the failing
--repeat 2 ext/session/tests/bug80889.phptand similar issues.