Skip to content

Commit b7ac027

Browse files
committed
Deprecate SID
1 parent 6faf1a7 commit b7ac027

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

ext/session/session.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,15 +1512,15 @@ PHPAPI zend_result php_session_reset_id(void) /* {{{ */
15121512
zval_ptr_dtor_str(sid);
15131513
ZVAL_STR(sid, smart_str_extract(&var));
15141514
} else {
1515-
REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), 0);
1515+
REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), CONST_DEPRECATED);
15161516
smart_str_free(&var);
15171517
}
15181518
} else {
15191519
if (sid) {
15201520
zval_ptr_dtor_str(sid);
15211521
ZVAL_EMPTY_STRING(sid);
15221522
} else {
1523-
REGISTER_STRINGL_CONSTANT("SID", "", 0, 0);
1523+
REGISTER_STRINGL_CONSTANT("SID", "", 0, CONST_DEPRECATED);
15241524
}
15251525
}
15261526

ext/session/tests/deprecations.phpt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ ini_set("session.referer_check", "");
4141
// Setting deprecated values directly in session_start()
4242
// Expecting deprecation here
4343
session_start([ 'use_cookies' => '0', 'use_only_cookies' => '0', 'use_trans_sid' => '1']);
44+
45+
echo SID;
46+
4447
?>
4548
--EXPECTF--
4649
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6
@@ -56,3 +59,6 @@ Deprecated: ini_set(): Usage of session.referer_check INI setting is deprecated
5659
Deprecated: session_start(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 32
5760

5861
Deprecated: session_start(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 32
62+
63+
Deprecated: Constant SID is deprecated in %s on line 34
64+
PHPSESSID=%s

0 commit comments

Comments
 (0)