[php-src] master: Improve merge

From: Date: Wed, 05 Aug 2026 08:34:02 +0000
Subject: [php-src] master: Improve merge
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140495@lists.php.net to get a copy of this message
Author: ndossche (ndossche) Date: 2026-08-05T10:33:58+02:00 Commit: https://github.com/php/php-src/commit/d7911aa9ea7ad60698f224d02686aa525700f38b Raw diff: https://github.com/php/php-src/commit/d7911aa9ea7ad60698f224d02686aa525700f38b.diff Improve merge Changed paths: M ext/session/session.c Diff: diff --git a/ext/session/session.c b/ext/session/session.c index 257eec002392..5711f0daf216 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -459,10 +459,8 @@ static zend_result php_session_initialize(void) } else if (PS(use_strict_mode) && PS(mod)->s_validate_sid && PS(mod)->s_validate_sid(&PS(mod_data), PS(id)) == FAILURE ) { - if (PS(id)) { - zend_string_release_ex(PS(id), false); - PS(id) = NULL; - } + zend_string_release_ex(PS(id), false); + PS(id) = NULL; PS(id) = PS(mod)->s_create_sid(&PS(mod_data)); if (!PS(id)) { PS(id) = php_session_create_id(NULL);

« previous php.cvs (#140495) next »