Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #80137
  Fix bug #80138

Author: nikic

ext/standard/tests/general_functions/getservbyname_basic.phpt

@@ -5,6 +5,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june
 Fabio Fabbrucci ([email protected])
 Michele Orselli ([email protected])
 Simone Gentili ([email protected])
+--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
 

ext/standard/tests/general_functions/getservbyport_basic.phpt

@@ -5,6 +5,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june
 Fabio Fabbrucci ([email protected])
 Michele Orselli ([email protected])
 Simone Gentili ([email protected])
+--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")) {

ext/standard/tests/general_functions/getservbyport_variation1.phpt

@@ -7,6 +7,12 @@ Italian PHP TestFest 2009 Cesena 19-20-21 june
 Fabio Fabbrucci ([email protected])
 Michele Orselli ([email protected])
 Simone Gentili ([email protected])
+--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" ));

ext/standard/tests/network/getprotobyname_basic.phpt

@@ -2,6 +2,12 @@
 getprotobyname function basic test
 --CREDITS--
 edgarsandi - <[email protected]>
+--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'));

ext/standard/tests/network/getprotobynumber_basic.phpt

@@ -2,6 +2,12 @@
 getprotobynumber function basic test
 --CREDITS--
 edgarsandi - <[email protected]>
+--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));