diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-04-09 19:02:25 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-04-09 19:02:25 +0200 |
| commit | e00e4b9334068c1c777ad7893fd9b0776e366bfd (patch) | |
| tree | 61328f2cdf8e456a89cbe51ca31e23191b6ff290 | |
| parent | 287790d5c83d0b23f5703fcb7c7640ef0548a64a (diff) | |
| parent | 2c8aeda6dc0f37cc835edc557e7e9dab876837c0 (diff) | |
| download | php-git-e00e4b9334068c1c777ad7893fd9b0776e366bfd.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 |