summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-04-09 19:04:35 +0200
committerFerenc Kovacs <tyrael@php.net>2014-04-09 19:04:35 +0200
commit1b1dabcf602ba1ba2f767ae8c59fa0917554f801 (patch)
tree8cf6176e5fc78935aa500c5084c56122a2022014
parent939b2db87d5ec8e1afeb685af2b961f8918e1588 (diff)
parentcbcce72308ad3b336055e13182729e9e43e8c4e5 (diff)
downloadphp-git-1b1dabcf602ba1ba2f767ae8c59fa0917554f801.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: abstract namespace for unix sockets is a linux only feature
-rw-r--r--ext/standard/tests/network/bug64330.phpt1
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