Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  abstract namespace for unix sockets is a linux only feature

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