Skip to content

ext/session: Add #[\Deprecated] to SID constant #19566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

ext/session: Add #[\Deprecated] to SID constant #19566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ext/session/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
#include "mod_mm.h"
#endif

#include "zend_attributes.h"

PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps)

static zend_result php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra);
Expand Down Expand Up @@ -1502,6 +1504,8 @@ PHPAPI zend_result php_session_reset_id(void)
/* zend_hash_str_del(EG(zend_constants), ZEND_STRL("sid")); */
sid = zend_get_constant_str(ZEND_STRL("SID"));

zend_constant *new_sid_constant = NULL;

if (PS(define_sid)) {
smart_str var = {0};

Expand All @@ -1513,17 +1517,25 @@ PHPAPI zend_result php_session_reset_id(void)
zval_ptr_dtor(sid);
ZVAL_STR(sid, smart_str_extract(&var));
} else {
REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), CONST_DEPRECATED);
new_sid_constant = REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), CONST_DEPRECATED);
smart_str_free(&var);
}
} else {
if (sid) {
zval_ptr_dtor(sid);
ZVAL_EMPTY_STRING(sid);
} else {
REGISTER_STRINGL_CONSTANT("SID", "", 0, CONST_DEPRECATED);
new_sid_constant = REGISTER_STRINGL_CONSTANT("SID", "", 0, CONST_DEPRECATED);
}
}
if (new_sid_constant != NULL) {
zend_string *deprecation_reason = zend_string_init("as GET/POST sessions were deprecated", strlen("as GET/POST sessions were deprecated"), 1);
zend_attribute *deprecation_attrib = zend_add_global_constant_attribute(new_sid_constant, ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
ZVAL_STR(&deprecation_attrib->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_4));
deprecation_attrib->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
ZVAL_STR(&deprecation_attrib->args[1].value, deprecation_reason);
deprecation_attrib->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
}

/* Apply trans sid if sid cookie is not set */
apply_trans_sid = 0;
Expand Down
2 changes: 1 addition & 1 deletion ext/session/tests/015.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is depre

Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0

Deprecated: Constant SID is deprecated in %s on line 6
Deprecated: Constant SID is deprecated since 8.4, as GET/POST sessions were deprecated in %s on line %d
<a href="/link?PHPSESSID=test015&PHPSESSID=test015">
4 changes: 2 additions & 2 deletions ext/session/tests/bug72940.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ session_destroy();
--EXPECTF--
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6

Deprecated: Constant SID is deprecated in %s on line 8
Deprecated: Constant SID is deprecated since 8.4, as GET/POST sessions were deprecated in %s on line %d
string(12) "bug72940test"
string(0) ""

Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 13

Deprecated: Constant SID is deprecated in %s on line 15
Deprecated: Constant SID is deprecated since 8.4, as GET/POST sessions were deprecated in %s on line %d
string(11) "bug72940get"
string(21) "PHPSESSID=bug72940get"
2 changes: 1 addition & 1 deletion ext/session/tests/deprecations.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ Deprecated: session_start(): Disabling session.use_only_cookies INI setting is d

Deprecated: session_start(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 32

Deprecated: Constant SID is deprecated in %s on line 34
Deprecated: Constant SID is deprecated since 8.4, as GET/POST sessions were deprecated in %s on line %d
PHPSESSID=%s