diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-23 10:48:35 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-23 10:48:35 +0200 |
commit | d21137368fbb1740188481af91c4aee7f4ac1328 (patch) | |
tree | 50603542d6c68876ebae869075c70f88db9d9a6c /ext/curl | |
parent | 625d8463a41d6b1da5921b87c93cebd06f1758f6 (diff) | |
parent | d30ec2cd85f2a6654dbad0910edc7435e25b4429 (diff) | |
download | php-git-d21137368fbb1740188481af91c4aee7f4ac1328.tar.gz |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #77493: curl_basic_009 fails with newer curl versions
Diffstat (limited to 'ext/curl')
-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) |