Skip to content

Commit 2b3dbe0

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Remove session ID set through REQUEST_URI
2 parents 8c243c2 + 1441f30 commit 2b3dbe0

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

ext/session/session.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ PHPAPI zend_result php_session_start(void) /* {{{ */
15041504
{
15051505
zval *ppid;
15061506
zval *data;
1507-
char *p, *value;
1507+
char *value;
15081508
size_t lensess;
15091509

15101510
switch (PS(session_status)) {
@@ -1580,21 +1580,6 @@ PHPAPI zend_result php_session_start(void) /* {{{ */
15801580
ppid2sid(ppid);
15811581
}
15821582
}
1583-
/* Check the REQUEST_URI symbol for a string of the form
1584-
* '<session-name>=<session-id>' to allow URLs of the form
1585-
* http://yoursite/<session-name>=<session-id>/script.php */
1586-
if (!PS(id) && zend_is_auto_global(ZSTR_KNOWN(ZEND_STR_AUTOGLOBAL_SERVER)) == SUCCESS &&
1587-
(data = zend_hash_str_find(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), "REQUEST_URI", sizeof("REQUEST_URI") - 1)) &&
1588-
Z_TYPE_P(data) == IS_STRING &&
1589-
(p = strstr(Z_STRVAL_P(data), PS(session_name))) &&
1590-
p[lensess] == '='
1591-
) {
1592-
char *q;
1593-
p += lensess + 1;
1594-
if ((q = strpbrk(p, "/?\\"))) {
1595-
PS(id) = zend_string_init(p, q - p, 0);
1596-
}
1597-
}
15981583
/* Check whether the current request was referred to by
15991584
* an external site which invalidates the previously found id. */
16001585
if (PS(id) && PS(extern_referer_chk)[0] != '\0' &&

0 commit comments

Comments
 (0)