diff --git a/ext/session/session.c b/ext/session/session.c index 078b3f0b3ce85..52b9da31808de 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2223,7 +2223,7 @@ static PHP_FUNCTION(session_regenerate_id) RETURN_FALSE; } if (PS(use_strict_mode) && PS(mod)->s_validate_sid && - PS(mod)->s_validate_sid(&PS(mod_data), PS(id)) == FAILURE) { + PS(mod)->s_validate_sid(&PS(mod_data), PS(id)) == SUCCESS) { zend_string_release_ex(PS(id), 0); PS(id) = PS(mod)->s_create_sid(&PS(mod_data)); if (!PS(id)) { @@ -2285,7 +2285,7 @@ static PHP_FUNCTION(session_create_id) break; } else { /* Detect collision and retry */ - if (PS(mod)->s_validate_sid(&PS(mod_data), new_id) == FAILURE) { + if (PS(mod)->s_validate_sid(&PS(mod_data), new_id) == SUCCESS) { zend_string_release_ex(new_id, 0); new_id = NULL; continue; diff --git a/ext/session/tests/bug79091.phpt b/ext/session/tests/bug79091.phpt index 1d14427159aca..4d60e698729ec 100644 --- a/ext/session/tests/bug79091.phpt +++ b/ext/session/tests/bug79091.phpt @@ -50,7 +50,7 @@ class MySessionHandler implements SessionHandlerInterface, SessionIdInterface, S public function validateId($key) { - return false; + return true; } } diff --git a/ext/session/tests/bug79413.phpt b/ext/session/tests/bug79413.phpt new file mode 100644 index 0000000000000..756b29f6ea6a3 --- /dev/null +++ b/ext/session/tests/bug79413.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #79413 (session_create_id() fails for active sessions) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(true)