[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Weilin Du (LamentXU123) Date: 2026-10-23T02:02:50+08:00 Commit: https://github.com/php/php-src/commit/550255df0e6f9ee7db4634eb43d3bcd33e42256e Raw diff: https://github.com/php/php-src/commit/550255df0e6f9ee7db4634eb43d3bcd33e42256e.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: ci: Fix OOM failures in header_over_4gib.phpt Changed paths: M ext/standard/tests/general_functions/header_over_4gib.phpt Diff: diff --git a/ext/standard/tests/general_functions/header_over_4gib.phpt b/ext/standard/tests/general_functions/header_over_4gib.phpt index a2075dfb27cd..8beb2521f886 100644 --- a/ext/standard/tests/general_functions/header_over_4gib.phpt +++ b/ext/standard/tests/general_functions/header_over_4gib.phpt @@ -5,7 +5,10 @@ header() with a header line longer than 4 GiB if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test'); if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); +if (PHP_OS === 'FreeBSD') die('skip Worker does not handle OOM gracefully'); ?> +--CONFLICTS-- +all --INI-- memory_limit=-1 --FILE--