diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-23 10:44:06 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-23 10:44:06 +0200 |
| commit | d30ec2cd85f2a6654dbad0910edc7435e25b4429 (patch) | |
| tree | f1a54956c4258d2ed0107826eb511efa20036bf6 /ext | |
| parent | ff0f6c26c20b97e47f2bb70f631165e3a8801aac (diff) | |
| parent | 9439d65f0d74d391f9620491896a1a04bc033648 (diff) | |
| download | php-git-d30ec2cd85f2a6654dbad0910edc7435e25b4429.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77493: curl_basic_009 fails with newer curl versions
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/curl/tests/curl_basic_009.phpt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt index 3b36a78540..a9aaf4c50f 100644 --- a/ext/curl/tests/curl_basic_009.phpt +++ b/ext/curl/tests/curl_basic_009.phpt @@ -7,7 +7,7 @@ TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net> --FILE-- <?php -$url = uniqid()."://www.".uniqid().".".uniqid(); +$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid(); $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); @@ -18,6 +18,6 @@ curl_close($ch); ?> ---EXPECTREGEX-- -string\(\d+\) "([^\r\n]*rotocol[^\r\n]+|Could not resolve host: .+)" -int\(\d\) +--EXPECTF-- +string(%d) "%Srotocol%s" +int(1) |