diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-06 15:02:41 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-06 15:02:41 +0200 |
commit | c358c280df6e81facad4045320cfdb1149a91463 (patch) | |
tree | a04926234733ede75bdd020d7b43a4b29982fdb6 /ext/curl/tests | |
parent | 7780ba9660248f7caf492c2dc8b4febb08bbb966 (diff) | |
parent | 5f2f6180b9ee5ed6324e6a64d13cf47b287f2d1b (diff) | |
download | php-git-c358c280df6e81facad4045320cfdb1149a91463.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test regarding Unix Domain Sockets on Windows
Diffstat (limited to 'ext/curl/tests')
-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 82f64fd894..a5f116748e 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -43,7 +43,7 @@ TLS-SRP => No HTTP2 => Yes GSSAPI => No KERBEROS5 => Yes -UNIX_SOCKETS => No +UNIX_SOCKETS => %r(Yes|No)%r PSL => No HTTPS_PROXY => Yes MULTI_SSL => %s |