[php-src] master: Merge branch 'PHP-8.3'
| From: | Niels Dossche | Date: | Thu, 11 Apr 2024 13:58:37 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128076@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-04-11T15:58:25+02:00
Commit: https://github.com/php/php-src/commit/bc62b41126fce499c68235268f26d31113ae2b4b
Raw diff: https://github.com/php/php-src/commit/bc62b41126fce499c68235268f26d31113ae2b4b.diff
Merge branch 'PHP-8.3'
* PHP-8.3:
ext/fileinfo/tests/bug78987.phpt: increase a memory limit
Changed paths:
M ext/fileinfo/tests/bug78987.phpt
Diff:
diff --git a/ext/fileinfo/tests/bug78987.phpt b/ext/fileinfo/tests/bug78987.phpt
index 396c787eaee12..ab7d9cad7167f 100644
--- a/ext/fileinfo/tests/bug78987.phpt
+++ b/ext/fileinfo/tests/bug78987.phpt
@@ -13,7 +13,7 @@ $maxSize = 16 * 1024 * 1024;
$map = array(
131072 => 10612736,
262144 => 10612736,
- 524288 => 11898880,
+ 524288 => 12189696,
1048576 => 12709888,
2097152 => 14811136,
4194304 => 19009536,