Skip to content

Commit d30ec2c

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #77493: curl_basic_009 fails with newer curl versions
2 parents ff0f6c2 + 9439d65 commit d30ec2c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/curl/tests/curl_basic_009.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TestFest 2009 - AFUP - Perrick Penet <[email protected]>
77
--FILE--
88
<?php
99

10-
$url = uniqid()."://www.".uniqid().".".uniqid();
10+
$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid();
1111
$ch = curl_init();
1212
curl_setopt($ch, CURLOPT_URL, $url);
1313

@@ -18,6 +18,6 @@ curl_close($ch);
1818

1919

2020
?>
21-
--EXPECTREGEX--
22-
string\(\d+\) "([^\r\n]*rotocol[^\r\n]+|Could not resolve host: .+)"
23-
int\(\d\)
21+
--EXPECTF--
22+
string(%d) "%Srotocol%s"
23+
int(1)

0 commit comments

Comments
 (0)