Skip to content

[pull] master from php:master #730

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
pull merged 6 commits into from
Feb 16, 2026
Merged

[pull] master from php:master #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbb2864
ext/session: pack boolean globals
Girgias Feb 16, 2026
99bf26b
ext/session: add mod_user_uses_object_methods_as_handlers global
Girgias Feb 16, 2026
b3c259c
Revert "ext/posix: validate permissions argument in posix_mkfifo()"
devnexen Feb 16, 2026
84bfe2f
Update EXTENSIONS to reflect reality
ndossche Feb 16, 2026
914969d
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Feb 16, 2026
6a51337
Merge branch 'PHP-8.5'
ndossche Feb 16, 2026
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
34 changes: 17 additions & 17 deletions EXTENSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,29 +170,29 @@ EXTENSION: dom
PRIMARY MAINTAINER: Christian Stocker <chregu@php.net> (2003 - 2011)
Rob Richards <rrichards@php.net> (2003 - 2012)
Marcus Börger <helly@php.net> (2003 - 2006)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.0
-------------------------------------------------------------------------------
EXTENSION: simplexml
PRIMARY MAINTAINER: Marcus Börger <helly@php.net> (2003 - 2008)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.0
-------------------------------------------------------------------------------
EXTENSION: soap
PRIMARY MAINTAINER: Dmitry Stogov <dmitry@php.net> (2004 - 2018)
Niels Dossche <nielsdos@php.net> (2024 - 2025)
Nora Dossche <nielsdos@php.net> (2024 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xml
PRIMARY MAINTAINER: Thies C. Arntzen <thies@thieso.net> (1999 - 2002)
Rob Richards <rrichards@php.net> (2003 - 2013)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: lexbor
Expand All @@ -205,29 +205,29 @@ SINCE: 8.5
EXTENSION: libxml
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2003 - 2009)
Christian Stocker <chregu@php.net> (2004 - 2011)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xmlreader
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2004 - 2010)
Christian Stocker <chregu@php.net> (2004 - 2004)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xmlwriter
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2004 - 2010)
Pierre-Alain Joye <pajoye@php.net> (2005-2009)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xsl
PRIMARY MAINTAINER: Christian Stocker <chregu@php.net> (2003 - 2011)
Rob Richards <rrichards@php.net> (2003 - 2010)
Niels Dossche <nielsdos@php.net> (2023 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2023 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.0
-------------------------------------------------------------------------------
Expand Down Expand Up @@ -495,8 +495,8 @@ EXTENSION: tidy
PRIMARY MAINTAINER: John Coggeshall <john@php.net> (2003 - 2006)
Ilia Alshanetsky <iliaa@php.net> (2003 - 2009)
Nuno Lopes <nlopess@php.net> (2006 - 2012)
Niels Dossche <nielsdos@php.net> (2025 - 2025)
MAINTENANCE: Maintained
Nora Dossche <nielsdos@php.net> (2025 - 2026)
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: tokenizer
Expand Down
2 changes: 0 additions & 2 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ PHP NEWS

- Posix:
. Added validity check to the flags argument for posix_access(). (arshidkv12)
. Added validity check to the permissions argument for posix_mkfifo().
(arshidkv12)

- Reflection:
. Fixed bug GH-20217 (ReflectionClass::isIterable() incorrectly returns true
Expand Down
3 changes: 3 additions & 0 deletions UPGRADING.INTERNALS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES

- ext/session:
. php_session_flush() now returns a bool rather than a zend_result.
. The mod_user_names global has been removed.
. The mod_user_uses_object_methods_as_handlers global has been added,
it indicates whether the session handlers are methods of an object or not.
. Removed session_adapt_url().
. PS_OPEN_ARGS is now defined as
`void **mod_data, zend_string *save_path, zend_string *session_name`
Expand Down
5 changes: 0 additions & 5 deletions ext/posix/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,11 +621,6 @@ PHP_FUNCTION(posix_mkfifo)
RETURN_FALSE;
}

if (mode < 0 || (mode & ~07777)) {
zend_argument_value_error(2, "must be between 0 and 0o7777");
RETURN_THROWS();
}

result = mkfifo(ZSTR_VAL(path), mode);
if (result < 0) {
POSIX_G(last_error) = errno;
Expand Down
36 changes: 0 additions & 36 deletions ext/posix/tests/posix_mkfifo_invalid_mode.phpt
View file
Open in desktop

This file was deleted.

27 changes: 14 additions & 13 deletions ext/session/php_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,19 @@ typedef struct _php_ps_globals {
bool cookie_secure;
bool cookie_httponly;
bool cookie_partitioned;
bool use_cookies;
bool use_only_cookies;
bool send_cookie;
bool auto_start;
bool define_sid;
const ps_module *mod;
const ps_module *default_mod;
void *mod_data;
php_session_status session_status;
bool use_strict_mode; /* whether or not PHP accepts unknown session ids */
bool lazy_write; /* omit session write when it is possible */
bool in_save_handler; /* state if session is in save handler or not */
bool set_handler; /* state if session module i setting handler or not */
zend_string *session_started_filename;
uint32_t session_started_lineno;
int module_number;
Expand All @@ -157,15 +166,8 @@ typedef struct _php_ps_globals {
zval ps_validate_sid;
zval ps_update_timestamp;
} mod_user_names;
bool mod_user_implemented;
bool mod_user_is_open;
bool auto_start;
bool use_cookies;
bool use_only_cookies;
bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
bool send_cookie;
bool define_sid;

zend_string *session_vars; /* serialized original session data */
const struct ps_serializer_struct *serializer;
zval http_session_vars;

Expand All @@ -180,11 +182,10 @@ typedef struct _php_ps_globals {
bool rfc1867_enabled; /* session.upload_progress.enabled */
bool rfc1867_cleanup; /* session.upload_progress.cleanup */

bool use_strict_mode; /* whether or not PHP accepts unknown session ids */
bool lazy_write; /* omit session write when it is possible */
bool in_save_handler; /* state if session is in save handler or not */
bool set_handler; /* state if session module i setting handler or not */
zend_string *session_vars; /* serialized original session data */
bool mod_user_implemented;
bool mod_user_is_open;
bool mod_user_uses_object_methods_as_handlers;
bool use_trans_sid; /* contains the INI value of whether to use trans-sid */
} php_ps_globals;

typedef php_ps_globals zend_ps_globals;
Expand Down
4 changes: 4 additions & 0 deletions ext/session/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ static inline void php_rinit_session_globals(void)
PS(set_handler) = false;
PS(mod_data) = NULL;
PS(mod_user_is_open) = false;
PS(mod_user_uses_object_methods_as_handlers) = false;
PS(define_sid) = true;
PS(session_vars) = NULL;
PS(module_number) = my_module_number;
Expand Down Expand Up @@ -2123,6 +2124,7 @@ PHP_FUNCTION(session_set_save_handler)
zend_string_release_ex(validate_sid_name, false);
zend_string_release_ex(update_timestamp_name, false);

PS(mod_user_uses_object_methods_as_handlers) = true;
if (register_shutdown) {
/* create shutdown function */
php_shutdown_function_entry shutdown_function_entry = {
Expand Down Expand Up @@ -2214,6 +2216,7 @@ PHP_FUNCTION(session_set_save_handler)
SESSION_SET_USER_HANDLER_PROCEDURAL_OPTIONAL(ps_validate_sid, validate_id_fci);
SESSION_SET_USER_HANDLER_PROCEDURAL_OPTIONAL(ps_update_timestamp, update_timestamp_fci);

PS(mod_user_uses_object_methods_as_handlers) = false;
RETURN_TRUE;
}

Expand Down Expand Up @@ -2843,6 +2846,7 @@ static PHP_GINIT_FUNCTION(ps)
ps_globals->default_mod = NULL;
ps_globals->mod_user_implemented = false;
ps_globals->mod_user_is_open = false;
ps_globals->mod_user_uses_object_methods_as_handlers = false;
ps_globals->session_vars = NULL;
ps_globals->set_handler = false;
ps_globals->session_started_filename = NULL;
Expand Down