Merge branch 'PHP-7.4'

* PHP-7.4:
  Unset ai_canonname field in dump

Author: nikic

ext/sockets/tests/socket_addrinfo_explain.phpt

@@ -10,12 +10,14 @@ if (!extension_loaded('sockets')) {
 $addrinfo = socket_addrinfo_lookup('127.0.0.1', 2000, array(
     'ai_family' => AF_INET,
     'ai_socktype' => SOCK_DGRAM,
-    'ai_flags' => AI_CANONNAME,
 ));
-var_dump(socket_addrinfo_explain($addrinfo[0]));
+$result = socket_addrinfo_explain($addrinfo[0]);
+// Musl sets ai_canonname even if AI_CANONNAME is not specified.
+unset($result['ai_canonname']);
+var_dump($result);
 echo "Done";
 --EXPECTF--
-array(6) {
+array(5) {
   ["ai_flags"]=>
   int(%d)
   ["ai_family"]=>
@@ -24,8 +26,6 @@ array(6) {
   int(2)
   ["ai_protocol"]=>
   int(%d)
-  ["ai_canonname"]=>
-  string(9) "127.0.0.1"
   ["ai_addr"]=>
   array(2) {
     ["sin_port"]=>