Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid socket path clash in test

Author: nikic

ext/sockets/tests/socket_cmsg_credentials.phpt

@@ -16,12 +16,12 @@ die('skip SO_PASSCRED is not defined');
 }
 --CLEAN--
 <?php
-$path = __DIR__ . "/unix_sock";
+$path = __DIR__ . "/socket_cmsg_credentials.sock";
 @unlink($path);
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
-$path = __DIR__ . "/unix_sock";
+$path = __DIR__ . "/socket_cmsg_credentials.sock";
 
 @unlink($path);
 

ext/sockets/tests/socket_cmsg_rights.phpt

@@ -13,12 +13,12 @@ die('skip not for AIX');
 }
 --CLEAN--
 <?php
-$path = __DIR__ . "/unix_sock";
+$path = __DIR__ . "/socket_cmsg_rights.sock";
 @unlink($path);
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
-$path = __DIR__ . "/unix_sock";
+$path = __DIR__ . "/socket_cmsg_rights.sock";
 
 @unlink($path);