From c2f450819853341417f6a17b951137f28efec653 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed, 5 Nov 2025 12:29:31 +0100
Subject: [PATCH 1/2] [skip ci] Avoid potential network port conflict in tests

These tests:

- ext/standard/tests/network/udp4loop.phpt
- ext/sockets/tests/socket_create_listen.phpt
- ext/sockets/tests/socket_create_listen-win32.phpt

all use port 31338. socket_create_listen.phpt and its win32 variant are mutually
exclusive, so they can't conflict. While udp4loop.phpt tries multiple ports, the
other tests do not. If udp4loop.phpt runs first and socket_create_listen.phpt
starts before it ends, the port is still blocked. Bump the start port for
udp4loop.phpt to avoid conflicts.
---
 ext/standard/tests/network/udp4loop.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/standard/tests/network/udp4loop.phpt b/ext/standard/tests/network/udp4loop.phpt
index 92709233ba19..bde3f8dcef56 100644
--- a/ext/standard/tests/network/udp4loop.phpt
+++ b/ext/standard/tests/network/udp4loop.phpt
@@ -3,7 +3,7 @@ Streams Based IPv4 UDP Loopback test
 --FILE--
 <?php
     /* Setup socket server */
-    for ($port = 31338; $port < 31500; ++$port) {
+    for ($port = 31339; $port < 31500; ++$port) {
       $uri = "udp://127.0.0.1:$port";
       $server = @stream_socket_server($uri, $errno, $errstr, STREAM_SERVER_BIND);
       if ($server) break;

From b9eaee18e445eae6b83c26e83624a8ea182ef627 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed, 5 Nov 2025 13:04:26 +0100
Subject: [PATCH 2/2] [skip ci] Skip fpm tests crashing lsan on GHA

> LeakSanitizer has encountered a fatal error.

This happens only on 8.2/8.3 for some reason. Don't merge for 8.4 for now, we
can do that later if it reoccurs.
---
 sapi/fpm/tests/bug68591-conf-test-group.phpt | 1 +
 sapi/fpm/tests/bug68591-conf-test-user.phpt  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sapi/fpm/tests/bug68591-conf-test-group.phpt b/sapi/fpm/tests/bug68591-conf-test-group.phpt
index d496d0549e87..36ea65b07f75 100644
--- a/sapi/fpm/tests/bug68591-conf-test-group.phpt
+++ b/sapi/fpm/tests/bug68591-conf-test-group.phpt
@@ -3,6 +3,7 @@ FPM: bug68591 - config test group existence
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (getenv("SKIP_ASAN") && getenv("GITHUB_ACTIONS")) die("skip leak sanitizer crashes");
 ?>
 --FILE--
 <?php
diff --git a/sapi/fpm/tests/bug68591-conf-test-user.phpt b/sapi/fpm/tests/bug68591-conf-test-user.phpt
index 5627151f3f13..636173e6549f 100644
--- a/sapi/fpm/tests/bug68591-conf-test-user.phpt
+++ b/sapi/fpm/tests/bug68591-conf-test-user.phpt
@@ -3,6 +3,7 @@ FPM: bug68591 - config test user existence
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (getenv("SKIP_ASAN") && getenv("GITHUB_ACTIONS")) die("skip leak sanitizer crashes");
 ?>
 --FILE--
 <?php