From 8a21d62c281614757fbc4223a4ea950ebd9c4568 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Mon, 13 Oct 2025 08:34:03 +0200
Subject: [PATCH 1/2] Update SKIPIF for bug #67563 (#20133)

---
 ext/mysqli/tests/bug67563.phpt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ext/mysqli/tests/bug67563.phpt b/ext/mysqli/tests/bug67563.phpt
index 72a51ecdccd2c..275d79e30c795 100644
--- a/ext/mysqli/tests/bug67563.phpt
+++ b/ext/mysqli/tests/bug67563.phpt
@@ -6,15 +6,12 @@ mysqli
 <?php
 require_once 'connect.inc';
 
-if ($host !== '127.0.0.1')
-    die('skip local test');
-
 if (@stream_socket_client('udp://[::1]:8888') === false)
-    die('skip no IPv6 support 2');
+    die('skip no IPv6 support');
 
-if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-        $host, $user, $db, $port, $socket));
+if (!$link = @my_mysqli_connect('[::1]', $user, $passwd, $db, $port, $socket)) {
+    die(sprintf("SKIP Cannot connect to the server using host=[::1], user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $user, $db, $port, $socket));
 }
 ?>
 --INI--

From c89f25bf6902bb97c981c2b5e7012b557f44e9ed Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:57:49 +0200
Subject: [PATCH 2/2] phar: Fix file descriptor/memory leak when opening
 central fp fails

Closes GH-20145.
---
 NEWS           | 1 +
 ext/phar/zip.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index b06b1bf300bca..8412c6c2bf48b 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP                                                                        NEWS
   . Fix memory leak of argument in webPhar. (nielsdos)
   . Fix memory leak when setAlias() fails. (nielsdos)
   . Fix memory leak in phar_parse_zipfile() error handling. (nielsdos)
+  . Fix file descriptor/memory leak when opening central fp fails. (nielsdos)
 
 - Random:
   . Fix Randomizer::__serialize() w.r.t. INDIRECTs. (nielsdos)
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 47a518f53ce7a..c188d6513abfe 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -1417,6 +1417,7 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
 	pass.centralfp = php_stream_fopen_tmpfile();
 
 	if (!pass.centralfp) {
+		php_stream_close(pass.filefp);
 		goto fperror;
 	}