summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Punt <tpunt@php.net>2018-04-29 17:38:12 +0100
committerThomas Punt <tpunt@php.net>2018-04-29 17:38:12 +0100
commitbeab62226598ea52c6e2e7bdf3ce7f688e7f6538 (patch)
treeb83d90688cb5b8d297cbc7756594fe3a4d6ac37f
parentd990b9316a9ecdd20263be825a588d3dee61fadb (diff)
parent35713efa025cd859f150949d9c5408f96f7564b9 (diff)
downloadphp-git-beab62226598ea52c6e2e7bdf3ce7f688e7f6538.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: The SO_PASSCRED constant is conditionally defined
-rw-r--r--ext/sockets/tests/socket_cmsg_credentials.phpt3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/sockets/tests/socket_cmsg_credentials.phpt b/ext/sockets/tests/socket_cmsg_credentials.phpt
index 922be0bb37..6fa2517db2 100644
--- a/ext/sockets/tests/socket_cmsg_credentials.phpt
+++ b/ext/sockets/tests/socket_cmsg_credentials.phpt
@@ -11,6 +11,9 @@ die('skip not for Microsoft Windows');
if (strtolower(substr(PHP_OS, 0, 3)) == 'aix') {
die('skip not for AIX');
}
+if (!defined('SO_PASSCRED')) {
+die('skip SO_PASSCRED is not defined');
+}
--CLEAN--
<?php
$path = __DIR__ . "/unix_sock";