diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-12 08:33:19 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-12 08:33:19 +0200 |
| commit | 2a11d88bc59338adf9cbbd97274b24ed39a3f704 (patch) | |
| tree | 1f037a305a070be8203057ac5ec0e14d729acdfe | |
| parent | 1e33a8ced486bf1084c4d9697973a8002ce7a426 (diff) | |
| parent | abe38b5e4823b08cdec72ca6207fc41a9a0a3152 (diff) | |
| download | php-git-2a11d88bc59338adf9cbbd97274b24ed39a3f704.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky test on OSX
| -rw-r--r-- | ext/sockets/tests/socket_create_listen-nobind.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sockets/tests/socket_create_listen-nobind.phpt b/ext/sockets/tests/socket_create_listen-nobind.phpt index c23ed5b642..bdd4d3dc2a 100644 --- a/ext/sockets/tests/socket_create_listen-nobind.phpt +++ b/ext/sockets/tests/socket_create_listen-nobind.phpt @@ -14,7 +14,7 @@ if (fileowner($filename) == 0) { } --FILE-- <?php -$sock = socket_create_listen(80); +$sock = socket_create_listen(PHP_OS == "Darwin" ? 427 : 80); --EXPECTF-- Warning: socket_create_listen(): unable to bind to given address [13]: Permission denied in %s on line %d --CLEAN-- |