[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
| From: | Ilia Alshanetsky | Date: | Tue, 13 Oct 2026 18:44:08 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142242@lists.php.net to get a copy of this message | ||
Author: Ilia Alshanetsky (iliaal)
Date: 2026-10-13T14:33:23-04:00
Commit: https://github.com/php/php-src/commit/f2a7cb81a693fa05b7db538cc859f6f77841fe90
Raw diff: https://github.com/php/php-src/commit/f2a7cb81a693fa05b7db538cc859f6f77841fe90.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/session: do not reuse session state a save handler tore down
Changed paths:
A ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt
A ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 46806b9ff0bc..cf42be929c4c 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2397,8 +2397,14 @@ PHP_FUNCTION(session_regenerate_id)
RETURN_FALSE;
}
}
+
PS(mod)->s_close(&PS(mod_data));
+ if (PS(session_status) != php_session_active) {
+ php_error_docref(NULL, E_WARNING, "Session ID cannot be regenerated because the save handler
closed the session");
+ RETURN_FALSE;
+ }
+
/* New session data */
if (PS(session_vars)) {
zend_string_release_ex(PS(session_vars), 0);
diff --git a/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt
b/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt
new file mode 100644
index 000000000000..b5cef21413f9
--- /dev/null
+++ b/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt
@@ -0,0 +1,65 @@
+--TEST--
+session_regenerate_id() when the close handler destroys the session
+--INI--
+session.gc_probability=0
+--EXTENSIONS--
+session
+--FILE--
+<?php
+
+ob_start();
+
+class MySessionHandler implements SessionHandlerInterface
+{
+ private bool $destroyed = false;
+
+ public function open(string $path, string $name): bool
+ {
+ return true;
+ }
+
+ public function close(): bool
+ {
+ if (!$this->destroyed) {
+ $this->destroyed = true;
+ session_destroy();
+ }
+ return true;
+ }
+
+ public function read(string $id): string|false
+ {
+ return '';
+ }
+
+ public function write(string $id, string $data): bool
+ {
+ return true;
+ }
+
+ public function destroy(string $id): bool
+ {
+ return true;
+ }
+
+ public function gc(int $max_lifetime): int|false
+ {
+ return 0;
+ }
+}
+
+session_set_save_handler(new MySessionHandler(), true);
+session_start();
+
+var_dump(session_regenerate_id(false));
+var_dump(session_status() === PHP_SESSION_NONE);
+
+?>
+--EXPECTF--
+Warning: session_destroy(): Cannot call session save handler in a recursive manner in %s on line %d
+
+Warning: session_destroy(): Session object destruction failed in %s on line %d
+
+Warning: session_regenerate_id(): Session ID cannot be regenerated because the save handler closed
the session in %s on line %d
+bool(false)
+bool(true)
diff --git
a/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt
b/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt
new file mode 100644
index 000000000000..d7b5007ce1fc
--- /dev/null
+++ b/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt
@@ -0,0 +1,35 @@
+--TEST--
+session_regenerate_id() when the save handler destroys the session
+--INI--
+session.gc_probability=0
+--EXTENSIONS--
+session
+--FILE--
+<?php
+
+ob_start();
+
+class MySessionHandler extends SessionHandler
+{
+ public function destroy(string $id): bool
+ {
+ session_destroy();
+ return true;
+ }
+}
+
+session_set_save_handler(new MySessionHandler(), true);
+session_start();
+
+var_dump(session_regenerate_id(true));
+var_dump(session_status() === PHP_SESSION_NONE);
+
+?>
+--EXPECTF--
+Warning: session_destroy(): Cannot call session save handler in a recursive manner in %s on line %d
+
+Warning: session_destroy(): Session object destruction failed in %s on line %d
+
+Warning: session_regenerate_id(): Session ID cannot be regenerated because the save handler closed
the session in %s on line %d
+bool(false)
+bool(true)