diff options
| author | Anatol Belski <ab@php.net> | 2018-01-12 12:21:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-01-12 12:21:43 +0100 |
| commit | baaf73be69623ee603adb041bbfb082dcf0976f6 (patch) | |
| tree | dfc2aedbdcc991c512ba540c779a239f5e6397c6 | |
| parent | e3fda6e5f67e6e0d06027af82289319fe708a4fb (diff) | |
| parent | 9d2662ea4b0da2e7e8b26aea84f923ff7b62a50a (diff) | |
| download | php-git-baaf73be69623ee603adb041bbfb082dcf0976f6.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Unify EOL
Extend test, latest cURL ships also with smb and smbs
| -rw-r--r-- | ext/curl/tests/check_win_config.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt index 405a1b9072..7f656ef9ea 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -45,7 +45,7 @@ GSSAPI => No KERBEROS5 => Yes UNIX_SOCKETS => No PSL => No -Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp +Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp Host => %s-pc-win32 SSL Version => OpenSSL/%s ZLib Version => %s |