diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-04-09 19:02:56 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-04-09 19:02:56 +0200 |
| commit | cbcce72308ad3b336055e13182729e9e43e8c4e5 (patch) | |
| tree | ed259f4eec826c5d2ff1796d7ee0733a171bcacc | |
| parent | 16ae4727696b29c9e3d2711be07be4f30be0bc6c (diff) | |
| parent | e00e4b9334068c1c777ad7893fd9b0776e366bfd (diff) | |
| download | php-git-cbcce72308ad3b336055e13182729e9e43e8c4e5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
abstract namespace for unix sockets is a linux only feature
| -rw-r--r-- | ext/standard/tests/network/bug64330.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/tests/network/bug64330.phpt b/ext/standard/tests/network/bug64330.phpt index 1ea305cb5f..e5653e7459 100644 --- a/ext/standard/tests/network/bug64330.phpt +++ b/ext/standard/tests/network/bug64330.phpt @@ -3,6 +3,7 @@ Bug #64330 (stream_socket_server() creates wrong Abstract Namespace UNIX sockets --SKIPIF-- <?php if (!in_array("unix", stream_get_transports())) die("SKIP unix domain sockets unavailable"); +if (!stristr(PHP_OS, "Linux")) die('skip abstract namespace is a Linux-only feature'); ?> --FILE-- <?php |