From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Sep 2020 08:59:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de2d38d53133c8ebd2587b298d032110c700b081;p=php

Merge branch 'PHP-7.4'

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

de2d38d53133c8ebd2587b298d032110c700b081
diff --cc ext/standard/tests/general_functions/getservbyport_basic.phpt
index cc02a4508e,0b3ab85a5d..6ab4d87207
--- a/ext/standard/tests/general_functions/getservbyport_basic.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_basic.phpt
@@@ -5,23 -5,29 +5,29 @@@ Italian PHP TestFest 2009 Cesena 19-20-
  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")) {
 -		$file = "/etc/services";
 -	}
 -	elseif(substr(PHP_OS,0,3) == "WIN") $file = "C:/WINDOWS/system32/drivers/etc/services";
 -	else die(PHP_OS. " unsupported");
 +    if (file_exists("/etc/services")) {
 +        $file = "/etc/services";
 +    }
 +    elseif(substr(PHP_OS,0,3) == "WIN") $file = "C:/WINDOWS/system32/drivers/etc/services";
 +    else die(PHP_OS. " unsupported");
  
 -	if(file_exists($file)){
 -		$services = file_get_contents($file);
 +    if(file_exists($file)){
 +        $services = file_get_contents($file);
                  $service = getservbyport( 80, "tcp" );
                  if(preg_match("/$service\s+80\/tcp/", $services)) {
 -			echo "PASS\n";
 -		}
 -	}else{
 -		echo "Services file not found in expected location\n";
 -	}
 +            echo "PASS\n";
 +        }
 +    }else{
 +        echo "Services file not found in expected location\n";
 +    }
  ?>
  --EXPECT--
  PASS
diff --cc ext/standard/tests/general_functions/getservbyport_variation1.phpt
index 349fe16a94,5193027d43..a6358027a5
--- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@@ -7,13 -7,23 +7,19 @@@ Italian PHP TestFest 2009 Cesena 19-20-
  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" ));
 -	var_dump(getservbyport( 80, "ppp" ));
 -	var_dump(getservbyport( null, null));
 -	var_dump(getservbyport( array(), array()));
 -	var_dump(getservbyport( array(80), array("tcp")));
 -	var_dump(getservbyport( array(2, 3), array("one"=>1, "two"=>2)));
 -	var_dump(getservbyport( 2, 2));
 -	var_dump(getservbyport( "80", "tcp"));
 -	var_dump(getservbyport( new stdClass(), new stdClass()));
 +    var_dump(getservbyport( -1, "tcp" ));
 +    var_dump(getservbyport( 80, "ppp" ));
 +    var_dump(getservbyport( null, null));
 +    var_dump(getservbyport( 2, 2));
 +    var_dump(getservbyport( "80", "tcp"));
  
  ?>
  --EXPECTF--
diff --cc ext/standard/tests/network/getprotobyname_basic.phpt
index ee5e396114,76ce3a6e99..1c02a6cc0f
--- a/ext/standard/tests/network/getprotobyname_basic.phpt
+++ b/ext/standard/tests/network/getprotobyname_basic.phpt
@@@ -2,9 -2,15 +2,15 @@@
  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'));
 +    var_dump(getprotobyname('tcp'));
  ?>
  --EXPECT--
  int(6)
diff --cc ext/standard/tests/network/getprotobynumber_basic.phpt
index d781ab92b0,e8245bd911..2441cbc9c1
--- a/ext/standard/tests/network/getprotobynumber_basic.phpt
+++ b/ext/standard/tests/network/getprotobynumber_basic.phpt
@@@ -2,9 -2,15 +2,15 @@@
  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));
 +    var_dump(getprotobynumber(6));
  ?>
  --EXPECT--
  string(3) "tcp"