com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/curl/test s/check_win_config.phpt
| From: | Anatol Belski | Date: | Fri, 08 Feb 2019 06:28:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/curl/test s/check_win_config.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104473@lists.php.net to get a copy of this message | ||
Commit: 1bbf7013c8a8153e0fd9fb80e83234e522a48c86
Author: Anatol Belski <ab@php.net> Thu, 7 Feb 2019 22:28:45 -0800
Parents: 8be649d908bef9d1ec7e45eb6ffaa19b77c03317 e27301c7b37f6a1643a0dc1966919bd62a32bc74
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1bbf7013c8a8153e0fd9fb80e83234e522a48c86
Log:
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
Changed paths:
MM ext/curl/tests/check_win_config.phpt
Diff:
diff --cc ext/curl/tests/check_win_config.phpt
index 8c9fcdd,33af4fc..82f64fd
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@@@ -45,10 -45,7 +45,10 @@@ GSSAPI => N
KERBEROS5 => Yes
UNIX_SOCKETS => No
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