Skip to content

Commit 0e843c5

Browse files
committed
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.
1 parent 3af76b2 commit 0e843c5

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

ext/curl/tests/curl_basic_009.phpt

+2-1
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.example.com";
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

+14-14
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ zend_leak_variable(do_stuff("php://memory"));
4242

4343
echo "\nDone.\n";
4444
?>
45-
--EXPECTF--
46-
temp stream (close after):
45+
--EXPECTREGEX--
46+
temp stream \(close after\):
4747
About to rewind!
48-
* Couldn't open file /i_dont_exist/
49-
* Closing connection%A%d
48+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
49+
\* Closing connection( -?\d+)?
5050

51-
memory stream (close after):
51+
memory stream \(close after\):
5252
About to rewind!
53-
* Couldn't open file /i_dont_exist/
54-
* Closing connection%A%d
53+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
54+
\* Closing connection( -?\d+)?
5555

56-
temp stream (leak):
56+
temp stream \(leak\):
5757
About to rewind!
58-
* Couldn't open file /i_dont_exist/
59-
* Closing connection%A%d
58+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
59+
\* Closing connection( -?\d+)?
6060

61-
memory stream (leak):
61+
memory stream \(leak\):
6262
About to rewind!
63-
* Couldn't open file /i_dont_exist/
64-
* Closing connection%A%d
63+
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
64+
\* Closing connection( -?\d+)?
6565

66-
Done.
66+
Done\.

0 commit comments

Comments
 (0)