diff options
| author | Anatol Belski <ab@php.net> | 2019-02-07 22:28:45 -0800 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-02-07 22:28:45 -0800 |
| commit | 1bbf7013c8a8153e0fd9fb80e83234e522a48c86 (patch) | |
| tree | 0566aa44873053f1d68292e0de1346b53e2f0d39 | |
| parent | 8be649d908bef9d1ec7e45eb6ffaa19b77c03317 (diff) | |
| parent | e27301c7b37f6a1643a0dc1966919bd62a32bc74 (diff) | |
| download | php-git-1bbf7013c8a8153e0fd9fb80e83234e522a48c86.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync test with changes in libcurl 7.64.0
Sync test for libcurl 7.64.0
| -rw-r--r-- | ext/curl/tests/check_win_config.phpt | 2 | ||||
| -rw-r--r-- | ext/curl/tests/curl_basic_009.phpt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt index 8c9fcddbc2..82f64fd894 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -48,7 +48,7 @@ PSL => No HTTPS_PROXY => Yes MULTI_SSL => %s BROTLI => %s -Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp +Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, ldaps, pop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp Host => %s-pc-win32 SSL Version => OpenSSL/%s ZLib Version => %s diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt index 99e94cd9b2..3b36a78540 100644 --- a/ext/curl/tests/curl_basic_009.phpt +++ b/ext/curl/tests/curl_basic_009.phpt @@ -18,6 +18,6 @@ curl_close($ch); ?> ---EXPECTF-- -string(%d) "%Srotocol%s" -int(1) +--EXPECTREGEX-- +string\(\d+\) "([^\r\n]*rotocol[^\r\n]+|Could not resolve host: .+)" +int\(\d\) |