[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
Jorg Sowa <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Jorg Sowa (jorgsowa)
Date: 2026-08-18T22:58:31+02:00
Commit: https://github.com/php/php-src/commit/1e4b1d41d7868c3685e24138b485fe074012ebc0
Raw diff: https://github.com/php/php-src/commit/1e4b1d41d7868c3685e24138b485fe074012ebc0.diff
Merge branch 'PHP-8.4' into PHP-8.5
Changed paths:
M ext/session/mod_user_class.c
Diff:
diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c
index 22be2cd15194..5547c3617b5f 100644
--- a/ext/session/mod_user_class.c
+++ b/ext/session/mod_user_class.c
@@ -154,6 +154,12 @@ PHP_METHOD(SessionHandler, create_sid)
PS_SANITY_CHECK;
id = PS(default_mod)->s_create_sid(&PS(mod_data));
+ if (!id) {
+ if (!EG(exception)) {
+ zend_throw_error(NULL, "Failed to create session ID: %s", PS(default_mod)->s_name);
+ }
+ RETURN_THROWS();
+ }
RETURN_STR(id);
}