diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-31 08:41:08 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-31 08:41:08 +0200 |
| commit | 12ca4fe65d09c3356c00c3f6846906350e6c85dc (patch) | |
| tree | b95526231aa4a62411f5085fafaf6b5241ed37df /ext/session/session.c | |
| parent | 457380cae7813a4a34faa1f9a49fa121395fe290 (diff) | |
| parent | d533fa15e609d894516cb0091b7cdb57667bde1f (diff) | |
| download | php-git-12ca4fe65d09c3356c00c3f6846906350e6c85dc.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79413: session_create_id() fails for active sessions
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index ad299209b6..9146183a4c 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2231,7 +2231,7 @@ static PHP_FUNCTION(session_regenerate_id) RETURN_THROWS(); } 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)) { @@ -2293,7 +2293,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; |