diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-29 10:59:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-29 10:59:32 +0200 |
| commit | 1fafcd2b282fabbae8a85de94b78e29f65635033 (patch) | |
| tree | d3f93c3333bde06b4566c7a5219c8c0b5688984f /ext | |
| parent | 205556c1913e8774c037f9335a908c328eabc56e (diff) | |
| parent | f5afd0a8270258fb70f70726ae3ed39780817038 (diff) | |
| download | php-git-1fafcd2b282fabbae8a85de94b78e29f65635033.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80137
Fix bug #80138
Diffstat (limited to 'ext')
5 files changed, 30 insertions, 0 deletions
diff --git a/ext/standard/tests/general_functions/getservbyname_basic.phpt b/ext/standard/tests/general_functions/getservbyname_basic.phpt index adaa7afb43..42504fc497 100644 --- a/ext/standard/tests/general_functions/getservbyname_basic.phpt +++ b/ext/standard/tests/general_functions/getservbyname_basic.phpt @@ -5,6 +5,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june Fabio Fabbrucci (fabbrucci@grupporetina.com) Michele Orselli (mo@ideato.it) Simone Gentili (sensorario@gmail.com) +--SKIPIF-- +<?php + if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ + if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); + } +?> --FILE-- <?php diff --git a/ext/standard/tests/general_functions/getservbyport_basic.phpt b/ext/standard/tests/general_functions/getservbyport_basic.phpt index b9e0f83c98..0b3ab85a5d 100644 --- a/ext/standard/tests/general_functions/getservbyport_basic.phpt +++ b/ext/standard/tests/general_functions/getservbyport_basic.phpt @@ -5,6 +5,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june Fabio Fabbrucci (fabbrucci@grupporetina.com) Michele Orselli (mo@ideato.it) Simone Gentili (sensorario@gmail.com) +--SKIPIF-- +<?php + if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ + if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); + } +?> --FILE-- <?php if (file_exists("/etc/services")) { diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt index a876ac1fea..5193027d43 100644 --- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt +++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt @@ -7,6 +7,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june Fabio Fabbrucci (fabbrucci@grupporetina.com) Michele Orselli (mo@ideato.it) Simone Gentili (sensorario@gmail.com) +--SKIPIF-- +<?php + if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ + if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); + } +?> --FILE-- <?php var_dump(getservbyport( -1, "tcp" )); diff --git a/ext/standard/tests/network/getprotobyname_basic.phpt b/ext/standard/tests/network/getprotobyname_basic.phpt index 37cc26aa2b..76ce3a6e99 100644 --- a/ext/standard/tests/network/getprotobyname_basic.phpt +++ b/ext/standard/tests/network/getprotobyname_basic.phpt @@ -2,6 +2,12 @@ getprotobyname function basic test --CREDITS-- edgarsandi - <edgar.r.sandi@gmail.com> +--SKIPIF-- +<?php + if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ + if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols"); + } +?> --FILE-- <?php var_dump(getprotobyname('tcp')); diff --git a/ext/standard/tests/network/getprotobynumber_basic.phpt b/ext/standard/tests/network/getprotobynumber_basic.phpt index 7850e60ffd..e8245bd911 100644 --- a/ext/standard/tests/network/getprotobynumber_basic.phpt +++ b/ext/standard/tests/network/getprotobynumber_basic.phpt @@ -2,6 +2,12 @@ getprotobynumber function basic test --CREDITS-- edgarsandi - <edgar.r.sandi@gmail.com> +--SKIPIF-- +<?php + if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ + if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols"); + } +?> --FILE-- <?php var_dump(getprotobynumber(6)); |