[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] [php-src] PHP-8.1: Merge branch 'PHP-8.0' into PHP-8.1
From:       Jakub Zelenka <noreply () php ! net>
Date:       2022-09-30 16:17:43
Message-ID: oyy11874QGs6B6oNNpnSHWM3LAtDBOJ0aiVVQlNOgs () main ! php ! net
[Download RAW message or body]

Author: Jakub Zelenka (bukka)
Date: 2022-09-30T17:08:17+01:00

Commit: https://github.com/php/php-src/commit/ee8f2c75e0a2ec6b2edac39b2ebad9a64f5a0030
 Raw diff: https://github.com/php/php-src/commit/ee8f2c75e0a2ec6b2edac39b2ebad9a64f5a0030.diff


Merge branch 'PHP-8.0' into PHP-8.1

Changed paths:
  M  ext/sockets/tests/socket_cmsg_credentials.phpt
  M  ext/sockets/tests/socket_cmsg_rights.phpt


Diff:

diff --git a/ext/sockets/tests/socket_cmsg_credentials.phpt \
b/ext/sockets/tests/socket_cmsg_credentials.phpt index 7402c9437c2b..02079ff1f1f5 \
                100644
--- a/ext/sockets/tests/socket_cmsg_credentials.phpt
+++ b/ext/sockets/tests/socket_cmsg_credentials.phpt
@@ -17,7 +17,7 @@ die('skip SO_PASSCRED is not defined');
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
-$path = __DIR__ . "/socket_cmsg_credentials.sock";
+$path = sys_get_temp_dir() . "/socket_cmsg_credentials.sock";
 
 @unlink($path);
 
@@ -55,7 +55,7 @@ var_dump($data['control'][0]['data']['pid'] === $pid);
 ?>
 --CLEAN--
 <?php
-$path = __DIR__ . "/socket_cmsg_credentials.sock";
+$path = sys_get_temp_dir() . "/socket_cmsg_credentials.sock";
 @unlink($path);
 --EXPECTF--
 creating send socket
diff --git a/ext/sockets/tests/socket_cmsg_rights.phpt \
b/ext/sockets/tests/socket_cmsg_rights.phpt index 2c45e449bdc3..b849afbbc1bf 100644
--- a/ext/sockets/tests/socket_cmsg_rights.phpt
+++ b/ext/sockets/tests/socket_cmsg_rights.phpt
@@ -11,14 +11,10 @@ die('skip not for Microsoft Windows');
 if (strtolower(substr(PHP_OS, 0, 3)) == 'aix') {
 die('skip not for AIX');
 }
---CLEAN--
-<?php
-$path = __DIR__ . "/socket_cmsg_rights.sock";
-@unlink($path);
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
-$path = __DIR__ . "/socket_cmsg_rights.sock";
+$path = sys_get_temp_dir() . "/socket_cmsg_rights.sock";
 
 @unlink($path);
 
@@ -78,6 +74,10 @@ if ($data["control"]) {
     var_dump($data);
 }
 ?>
+--CLEAN--
+<?php
+$path = sys_get_temp_dir() . "/socket_cmsg_rights.sock";
+@unlink($path);
 --EXPECTF--
 creating send socket
 object(Socket)#%d (0) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]