diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 14:59:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 14:59:06 +0200 |
| commit | 002908a5c5db8be34973fefe699d7b35b880989e (patch) | |
| tree | 68a608b5b70ba4da811a39391dc2f1ac8a9d3f29 /ext/sockets | |
| parent | 7575340427109fb5dde02cdc2ca83d78a5786426 (diff) | |
| parent | b69a98cfb3682cbbd2e2ff5c09a070f20c395149 (diff) | |
| download | php-git-002908a5c5db8be34973fefe699d7b35b880989e.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Unset ai_canonname field in dump
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/tests/socket_addrinfo_explain.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/sockets/tests/socket_addrinfo_explain.phpt b/ext/sockets/tests/socket_addrinfo_explain.phpt index ebc60afa51..16366ac1be 100644 --- a/ext/sockets/tests/socket_addrinfo_explain.phpt +++ b/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"]=> |