diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-06 15:00:35 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-06 15:00:35 +0200 |
| commit | 5f2f6180b9ee5ed6324e6a64d13cf47b287f2d1b (patch) | |
| tree | 595ba0fb78a56a7ede5f95292e90a22559200e1a | |
| parent | 22a3fa0b2e31e33665765bde630bc6c6f0dd475b (diff) | |
| parent | 2df32942d3ec9b70e791225aeee70a857b9b292e (diff) | |
| download | php-git-5f2f6180b9ee5ed6324e6a64d13cf47b287f2d1b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test regarding Unix Domain Sockets on Windows
| -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 |