[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Weilin Du | Date: | Thu, 22 Oct 2026 18:05:47 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142603@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-10-23T02:03:37+08:00
Commit: https://github.com/php/php-src/commit/1ec36cfdd9d67c8e3015e886ce43148cea2a19be
Raw diff: https://github.com/php/php-src/commit/1ec36cfdd9d67c8e3015e886ce43148cea2a19be.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
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--