JLinux Code

Commit f54f4467ba9 for php

commit f54f4467ba9205a0aa4c3b572fbbe3f117b7e0ba
Merge: f991e962b1b ef4fa599281
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Fri Oct 2 14:13:06 2026 +0530

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Backport fixes for macOS 26 (#24031)

diff --cc ext/lexbor/config.m4
index 21fabcd0ddb,00000000000..a75f490e77c
mode 100644,000000..100644
--- a/ext/lexbor/config.m4
+++ b/ext/lexbor/config.m4
@@@ -1,223 -1,0 +1,223 @@@
- PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/"
++PHP_LEXBOR_CFLAGS="-Wno-unknown-warning-option -Wno-unterminated-string-initialization -I@ext_srcdir@/"
 +LEXBOR_DIR="lexbor"
 +
 +AC_DEFINE([HAVE_LEXBOR], [1], [Define to 1 if the PHP extension 'lexbor' is available.])
 +
 +PHP_NEW_EXTENSION([lexbor], m4_normalize([
 +    php_lexbor.c
 +    $LEXBOR_DIR/core/array_obj.c
 +    $LEXBOR_DIR/core/array.c
 +    $LEXBOR_DIR/core/avl.c
 +    $LEXBOR_DIR/core/bst.c
 +    $LEXBOR_DIR/core/conv.c
 +    $LEXBOR_DIR/core/diyfp.c
 +    $LEXBOR_DIR/core/dobject.c
 +    $LEXBOR_DIR/core/dtoa.c
 +    $LEXBOR_DIR/core/hash.c
 +    $LEXBOR_DIR/core/mem.c
 +    $LEXBOR_DIR/core/mraw.c
 +    $LEXBOR_DIR/core/plog.c
 +    $LEXBOR_DIR/core/print.c
 +    $LEXBOR_DIR/core/serialize.c
 +    $LEXBOR_DIR/core/shs.c
 +    $LEXBOR_DIR/core/str.c
 +    $LEXBOR_DIR/core/strtod.c
 +    $LEXBOR_DIR/css/at_rule.c
 +    $LEXBOR_DIR/css/at_rule/state.c
 +    $LEXBOR_DIR/css/blank.c
 +    $LEXBOR_DIR/css/css.c
 +    $LEXBOR_DIR/css/declaration.c
 +    $LEXBOR_DIR/css/log.c
 +    $LEXBOR_DIR/css/parser.c
 +    $LEXBOR_DIR/css/property.c
 +    $LEXBOR_DIR/css/property/state.c
 +    $LEXBOR_DIR/css/rule.c
 +    $LEXBOR_DIR/css/selectors/pseudo_state.c
 +    $LEXBOR_DIR/css/selectors/pseudo.c
 +    $LEXBOR_DIR/css/selectors/selector.c
 +    $LEXBOR_DIR/css/selectors/selectors.c
 +    $LEXBOR_DIR/css/selectors/state.c
 +    $LEXBOR_DIR/css/state.c
 +    $LEXBOR_DIR/css/stylesheet.c
 +    $LEXBOR_DIR/css/syntax/anb.c
 +    $LEXBOR_DIR/css/syntax/parser.c
 +    $LEXBOR_DIR/css/syntax/state.c
 +    $LEXBOR_DIR/css/syntax/syntax.c
 +    $LEXBOR_DIR/css/syntax/token.c
 +    $LEXBOR_DIR/css/syntax/tokenizer.c
 +    $LEXBOR_DIR/css/syntax/tokenizer/error.c
 +    $LEXBOR_DIR/css/unit.c
 +    $LEXBOR_DIR/css/value.c
 +    $LEXBOR_DIR/dom/interface.c
 +    $LEXBOR_DIR/dom/interfaces/attr.c
 +    $LEXBOR_DIR/dom/interfaces/cdata_section.c
 +    $LEXBOR_DIR/dom/interfaces/character_data.c
 +    $LEXBOR_DIR/dom/interfaces/comment.c
 +    $LEXBOR_DIR/dom/interfaces/document_fragment.c
 +    $LEXBOR_DIR/dom/interfaces/document_type.c
 +    $LEXBOR_DIR/dom/interfaces/document.c
 +    $LEXBOR_DIR/dom/interfaces/element.c
 +    $LEXBOR_DIR/dom/interfaces/node.c
 +    $LEXBOR_DIR/dom/interfaces/processing_instruction.c
 +    $LEXBOR_DIR/dom/interfaces/shadow_root.c
 +    $LEXBOR_DIR/dom/interfaces/text.c
 +    $LEXBOR_DIR/encoding/decode.c
 +    $LEXBOR_DIR/encoding/encode.c
 +    $LEXBOR_DIR/encoding/encoding.c
 +    $LEXBOR_DIR/encoding/multi.c
 +    $LEXBOR_DIR/encoding/range.c
 +    $LEXBOR_DIR/encoding/res.c
 +    $LEXBOR_DIR/encoding/single.c
 +    $LEXBOR_DIR/html/encoding.c
 +    $LEXBOR_DIR/html/interface.c
 +    $LEXBOR_DIR/html/interfaces/anchor_element.c
 +    $LEXBOR_DIR/html/interfaces/area_element.c
 +    $LEXBOR_DIR/html/interfaces/audio_element.c
 +    $LEXBOR_DIR/html/interfaces/base_element.c
 +    $LEXBOR_DIR/html/interfaces/body_element.c
 +    $LEXBOR_DIR/html/interfaces/br_element.c
 +    $LEXBOR_DIR/html/interfaces/button_element.c
 +    $LEXBOR_DIR/html/interfaces/canvas_element.c
 +    $LEXBOR_DIR/html/interfaces/d_list_element.c
 +    $LEXBOR_DIR/html/interfaces/data_element.c
 +    $LEXBOR_DIR/html/interfaces/data_list_element.c
 +    $LEXBOR_DIR/html/interfaces/details_element.c
 +    $LEXBOR_DIR/html/interfaces/dialog_element.c
 +    $LEXBOR_DIR/html/interfaces/directory_element.c
 +    $LEXBOR_DIR/html/interfaces/div_element.c
 +    $LEXBOR_DIR/html/interfaces/document.c
 +    $LEXBOR_DIR/html/interfaces/element.c
 +    $LEXBOR_DIR/html/interfaces/embed_element.c
 +    $LEXBOR_DIR/html/interfaces/field_set_element.c
 +    $LEXBOR_DIR/html/interfaces/font_element.c
 +    $LEXBOR_DIR/html/interfaces/form_element.c
 +    $LEXBOR_DIR/html/interfaces/frame_element.c
 +    $LEXBOR_DIR/html/interfaces/frame_set_element.c
 +    $LEXBOR_DIR/html/interfaces/head_element.c
 +    $LEXBOR_DIR/html/interfaces/heading_element.c
 +    $LEXBOR_DIR/html/interfaces/hr_element.c
 +    $LEXBOR_DIR/html/interfaces/html_element.c
 +    $LEXBOR_DIR/html/interfaces/iframe_element.c
 +    $LEXBOR_DIR/html/interfaces/image_element.c
 +    $LEXBOR_DIR/html/interfaces/input_element.c
 +    $LEXBOR_DIR/html/interfaces/label_element.c
 +    $LEXBOR_DIR/html/interfaces/legend_element.c
 +    $LEXBOR_DIR/html/interfaces/li_element.c
 +    $LEXBOR_DIR/html/interfaces/link_element.c
 +    $LEXBOR_DIR/html/interfaces/map_element.c
 +    $LEXBOR_DIR/html/interfaces/marquee_element.c
 +    $LEXBOR_DIR/html/interfaces/media_element.c
 +    $LEXBOR_DIR/html/interfaces/menu_element.c
 +    $LEXBOR_DIR/html/interfaces/meta_element.c
 +    $LEXBOR_DIR/html/interfaces/meter_element.c
 +    $LEXBOR_DIR/html/interfaces/mod_element.c
 +    $LEXBOR_DIR/html/interfaces/o_list_element.c
 +    $LEXBOR_DIR/html/interfaces/object_element.c
 +    $LEXBOR_DIR/html/interfaces/opt_group_element.c
 +    $LEXBOR_DIR/html/interfaces/option_element.c
 +    $LEXBOR_DIR/html/interfaces/output_element.c
 +    $LEXBOR_DIR/html/interfaces/paragraph_element.c
 +    $LEXBOR_DIR/html/interfaces/param_element.c
 +    $LEXBOR_DIR/html/interfaces/picture_element.c
 +    $LEXBOR_DIR/html/interfaces/pre_element.c
 +    $LEXBOR_DIR/html/interfaces/progress_element.c
 +    $LEXBOR_DIR/html/interfaces/quote_element.c
 +    $LEXBOR_DIR/html/interfaces/script_element.c
 +    $LEXBOR_DIR/html/interfaces/search_element.c
 +    $LEXBOR_DIR/html/interfaces/select_element.c
 +    $LEXBOR_DIR/html/interfaces/selectedcontent_element.c
 +    $LEXBOR_DIR/html/interfaces/slot_element.c
 +    $LEXBOR_DIR/html/interfaces/source_element.c
 +    $LEXBOR_DIR/html/interfaces/span_element.c
 +    $LEXBOR_DIR/html/interfaces/style_element.c
 +    $LEXBOR_DIR/html/interfaces/table_caption_element.c
 +    $LEXBOR_DIR/html/interfaces/table_cell_element.c
 +    $LEXBOR_DIR/html/interfaces/table_col_element.c
 +    $LEXBOR_DIR/html/interfaces/table_element.c
 +    $LEXBOR_DIR/html/interfaces/table_row_element.c
 +    $LEXBOR_DIR/html/interfaces/table_section_element.c
 +    $LEXBOR_DIR/html/interfaces/template_element.c
 +    $LEXBOR_DIR/html/interfaces/text_area_element.c
 +    $LEXBOR_DIR/html/interfaces/time_element.c
 +    $LEXBOR_DIR/html/interfaces/title_element.c
 +    $LEXBOR_DIR/html/interfaces/track_element.c
 +    $LEXBOR_DIR/html/interfaces/u_list_element.c
 +    $LEXBOR_DIR/html/interfaces/unknown_element.c
 +    $LEXBOR_DIR/html/interfaces/video_element.c
 +    $LEXBOR_DIR/html/interfaces/window.c
 +    $LEXBOR_DIR/html/parser.c
 +    $LEXBOR_DIR/html/tag.c
 +    $LEXBOR_DIR/html/token_attr.c
 +    $LEXBOR_DIR/html/token.c
 +    $LEXBOR_DIR/html/tokenizer.c
 +    $LEXBOR_DIR/html/tokenizer/error.c
 +    $LEXBOR_DIR/html/tokenizer/state_comment.c
 +    $LEXBOR_DIR/html/tokenizer/state_doctype.c
 +    $LEXBOR_DIR/html/tokenizer/state_rawtext.c
 +    $LEXBOR_DIR/html/tokenizer/state_rcdata.c
 +    $LEXBOR_DIR/html/tokenizer/state_script.c
 +    $LEXBOR_DIR/html/tokenizer/state.c
 +    $LEXBOR_DIR/html/tree.c
 +    $LEXBOR_DIR/html/tree/active_formatting.c
 +    $LEXBOR_DIR/html/tree/error.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/after_after_body.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/after_after_frameset.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/after_body.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/after_frameset.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/after_head.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/before_head.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/before_html.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/foreign_content.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_body.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_caption.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_cell.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_column_group.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_frameset.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_head_noscript.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_head.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_row.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_table_body.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_table_text.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_table.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/in_template.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/initial.c
 +    $LEXBOR_DIR/html/tree/insertion_mode/text.c
 +    $LEXBOR_DIR/html/tree/open_elements.c
 +    $LEXBOR_DIR/ns/ns.c
 +    $LEXBOR_DIR/ports/posix/lexbor/core/memory.c
 +    $LEXBOR_DIR/punycode/punycode.c
 +    $LEXBOR_DIR/tag/tag.c
 +    $LEXBOR_DIR/unicode/idna.c
 +    $LEXBOR_DIR/unicode/unicode.c
 +    $LEXBOR_DIR/url/url.c
 +  ]),
 +  [no],,
 +  [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $PHP_LEXBOR_CFLAGS])
 +
 +PHP_ADD_BUILD_DIR([
 +  $ext_builddir/
 +  $ext_builddir/$LEXBOR_DIR/core
 +  $ext_builddir/$LEXBOR_DIR/css/at_rule
 +  $ext_builddir/$LEXBOR_DIR/css/property
 +  $ext_builddir/$LEXBOR_DIR/css/selectors
 +  $ext_builddir/$LEXBOR_DIR/css/syntax/tokenizer
 +  $ext_builddir/$LEXBOR_DIR/css/tokenizer
 +  $ext_builddir/$LEXBOR_DIR/dom/interfaces
 +  $ext_builddir/$LEXBOR_DIR/encoding
 +  $ext_builddir/$LEXBOR_DIR/html
 +  $ext_builddir/$LEXBOR_DIR/html/interfaces
 +  $ext_builddir/$LEXBOR_DIR/html/tokenizer
 +  $ext_builddir/$LEXBOR_DIR/html/tree/insertion_mode
 +  $ext_builddir/$LEXBOR_DIR/ns
 +  $ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
 +  $ext_builddir/$LEXBOR_DIR/punycode
 +  $ext_builddir/$LEXBOR_DIR/tag
 +  $ext_builddir/$LEXBOR_DIR/unicode
 +  $ext_builddir/$LEXBOR_DIR/url
 +])
 +PHP_ADD_INCLUDE([$ext_srcdir])
 +PHP_INSTALL_HEADERS([ext/lexbor], m4_normalize([
 +  php_lexbor.h
 +]))
 +
 +PHP_SUBST([LEXBOR_SHARED_LIBADD])
diff --cc ext/standard/proc_open.c
index da03160c277,20f093f2183..3a16d2c84f2
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@@ -35,10 -35,10 +35,10 @@@
  #include <fcntl.h>
  #endif

- #ifdef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP
+ #if defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP) || defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)
  /* Only defined on glibc >= 2.29, FreeBSD CURRENT, musl >= 1.1.24,
   * MacOS Catalina or later..
 - * It should be posible to modify this so it is also
 + * It should be possible to modify this so it is also
   * used in older systems when $cwd == NULL but care must be taken
   * as at least glibc < 2.24 has a legacy implementation known
   * to be really buggy.