Commit 9306c9584b0 for php.net

commit 9306c9584b01f29d2986460a13a7a34b991a9063
Merge: 4f3244351da 303610154bb
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Thu Apr 24 11:28:47 2025 +0200

    Merge branch 'PHP-8.4'

    * PHP-8.4:
      [skip ci] Increase tolerance for cve-2014-3538 tests

diff --cc ext/fileinfo/tests/cve-2014-3538-nojit.phpt
index 73ecd09561d,3fe21168ab8..e8c32b7d758
--- a/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
@@@ -23,7 -23,8 +23,7 @@@ $fi = finfo_open(FILEINFO_NONE)
  $t = microtime(true);
  var_dump(finfo_file($fi, $fd));
  $t = microtime(true) - $t;
- if ($t < 1.5) {
 -finfo_close($fi);
+ if ($t < 2) {
      echo "Ok\n";
  } else {
      printf("Failed, time=%.2f\n", $t);
diff --cc ext/fileinfo/tests/cve-2014-3538.phpt
index d19278d1dc3,64d470742dc..798317003a2
--- a/ext/fileinfo/tests/cve-2014-3538.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538.phpt
@@@ -19,7 -19,8 +19,7 @@@ $fi = finfo_open(FILEINFO_NONE)
  $t = microtime(true);
  var_dump(finfo_file($fi, $fd));
  $t = microtime(true) - $t;
- if ($t < 1.5) {
 -finfo_close($fi);
+ if ($t < 2) {
      echo "Ok\n";
  } else {
      printf("Failed, time=%.2f\n", $t);