Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3: Fixed bug #80077
2025-01-03 17:33:32 +08:00 · 2020-09-08 10:01:03 +02:00 · 2020-09-08 10:01:03 +02:00 · d0d9c3a980
commit d0d9c3a980
parent 2a334f1655 07cb665515
2 changed files with 4 additions and 3 deletions
--- a/1
+++ b/1
@ -30,6 +30,7 @@ PHP                                                                        NEWS

 - Standard:
  . Fixed bug #79986 (str_ireplace bug with diacritics characters). (cmb)
+  . Fixed bug #80077 (getmxrr test bug). (Rainer Jung)

 03 Sep 2020, PHP 7.4.10

--- a/ext/standard/tests/network/getmxrr.phpt
+++ b/ext/standard/tests/network/getmxrr.phpt
@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 $domains = array(
-    'mx1.tests.php.net',
-    'mx2.tests.php.net',
-    'qa.php.net',
+    'mx1.tests.php.net.',
+    'mx2.tests.php.net.',
+    'qa.php.net.',
 );
 foreach ($domains as $domain) {
    $result = getmxrr($domain, $hosts, $weights);