archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source
This commit is contained in:
Levi Morrison 2024-07-23 16:33:40 -06:00
commit e43d9c7469
No known key found for this signature in database
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/session/session.c
View file

@ -132,7 +132,7 @@ static inline void php_session_cleanup_filename(void) /* {{{ */
/* }}} */
/* Dispatched by RSHUTDOWN and by php_session_destroy */
static inline void php_rshutdown_session_globals(void) /* {{{ */
static void php_rshutdown_session_globals(void) /* {{{ */
{
/* Do NOT destroy PS(mod_user_names) here! */
if (!Z_ISUNDEF(PS(http_session_vars))) {

2
ext/spl/spl_directory.c
View file

@ -230,7 +230,7 @@ PHPAPI zend_string *spl_filesystem_object_get_path(spl_filesystem_object *intern
return zend_string_copy(intern->path);
} /* }}} */
static inline zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *intern) /* {{{ */
static zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *intern) /* {{{ */
{
if (intern->file_name) {
/* already known */

2
ext/spl/spl_heap.c
View file

@ -505,7 +505,7 @@ static zend_result spl_heap_object_count_elements(zend_object *object, zend_long
}
/* }}} */
static inline HashTable* spl_heap_object_get_debug_info(zend_class_entry *ce, zend_object *obj) { /* {{{ */
static HashTable* spl_heap_object_get_debug_info(zend_class_entry *ce, zend_object *obj) { /* {{{ */
spl_heap_object *intern = spl_heap_from_obj(obj);
zval tmp, heap_array;
zend_string *pnstr;