Skip to content

Commit 2b2d2b0

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Fix EXPECT for bug52820.phpt on newer curl versions Fix curl_basic_009.phpt for newer curl versions
2 parents 1bddd4e + 1aae59c commit 2b2d2b0

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

ext/curl/tests/curl_basic_009.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ curl
77
--FILE--
88
<?php
99

10-
$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid();
10+
// Make sure the scheme always starts with an alphabetic character.
11+
$url = 'a' . substr(uniqid(),0,6)."://www.example.com";
1112
$ch = curl_init();
1213
curl_setopt($ch, CURLOPT_URL, $url);
1314

ext/standard/tests/file/bug52820.phpt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ zend_leak_variable(do_stuff("php://memory"));
4444

4545
echo "\nDone.\n";
4646
?>
47-
--EXPECTF--
48-
temp stream (close after):
47+
--EXPECTREGEX--
48+
temp stream \(close after\):
4949
About to rewind!
50-
* Couldn't open file /i_dont_exist/
51-
* Closing connection%A%d
50+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
51+
\* Closing connection( -?\d+)?
5252

53-
memory stream (close after):
53+
memory stream \(close after\):
5454
About to rewind!
55-
* Couldn't open file /i_dont_exist/
56-
* Closing connection%A%d
55+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
56+
\* Closing connection( -?\d+)?
5757

58-
temp stream (leak):
58+
temp stream \(leak\):
5959
About to rewind!
60-
* Couldn't open file /i_dont_exist/
61-
* Closing connection%A%d
60+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
61+
\* Closing connection( -?\d+)?
6262

63-
memory stream (leak):
63+
memory stream \(leak\):
6464
About to rewind!
65-
* Couldn't open file /i_dont_exist/
66-
* Closing connection%A%d
65+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
66+
\* Closing connection( -?\d+)?
6767

68-
Done.
68+
Done\.

0 commit comments

Comments
 (0)