From 3af76b2302c2d91609c6165260df0e564897f6c2 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Thu, 10 Aug 2023 12:12:05 +0200
Subject: [PATCH 1/2] Fix curl_basic_009.phpt for newer curl versions

---
 ext/curl/tests/curl_basic_009.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 26bc35891cc..564663f1d8f 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -7,7 +7,7 @@ curl
 --FILE--
 <?php
 
-$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid();
+$url = substr(uniqid(),0,7)."://www.example.com";
 $ch = curl_init();
 curl_setopt($ch, CURLOPT_URL, $url);
 

From 0e843c5d822f22248d9389e2e1d0223988f39db5 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Thu, 10 Aug 2023 12:39:37 +0200
Subject: [PATCH 2/2] Fix EXPECT for bug52820.phpt on newer curl versions

New curl versions have a "processing: url" line. The connection number in
"Closing connection" is apparently also dropped.
---
 ext/curl/tests/curl_basic_009.phpt    |  3 ++-
 ext/standard/tests/file/bug52820.phpt | 28 +++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 564663f1d8f..ade7cffcb82 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -7,7 +7,8 @@ curl
 --FILE--
 <?php
 
-$url = substr(uniqid(),0,7)."://www.example.com";
+// Make sure the scheme always starts with an alphabetic character.
+$url = 'a' . substr(uniqid(),0,6)."://www.example.com";
 $ch = curl_init();
 curl_setopt($ch, CURLOPT_URL, $url);
 
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 038c569cd2d..78cfeb61fa9 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -42,25 +42,25 @@ zend_leak_variable(do_stuff("php://memory"));
 
 echo "\nDone.\n";
 ?>
---EXPECTF--
-temp stream (close after):
+--EXPECTREGEX--
+temp stream \(close after\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-memory stream (close after):
+memory stream \(close after\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-temp stream (leak):
+temp stream \(leak\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-memory stream (leak):
+memory stream \(leak\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-Done.
+Done\.