diff --git a/regress/lib/libc/getaddrinfo/answer b/regress/lib/libc/getaddrinfo/answer
index 1e8d29d9f8ad..aa619dda7b67 100644
--- a/regress/lib/libc/getaddrinfo/answer
+++ b/regress/lib/libc/getaddrinfo/answer
@@ -1,11 +1,15 @@
 == basic ones
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv www
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
 ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
@@ -27,14 +31,18 @@ ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv ech
 
 == specific address family
 arg: flags 0x2 family 2 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
 arg: flags 0x2 family 24 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
 
 == empty hostname
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv www
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
 ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
 ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
@@ -46,8 +54,10 @@ ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
 servname not supported for ai_socktype
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv www
-ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv www
+ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv http
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv http
+ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv http
+ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv http
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
 ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv echo
 ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv echo
@@ -59,11 +69,11 @@ ai2: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 69
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
 servname not supported for ai_socktype
 arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv www
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
 arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv www
-ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
 
 == empty servname
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty)
@@ -100,5 +110,6 @@ ai_family not supported
 
 == the following items are specified in jinmei scopeaddr format doc.
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host fe80::1%lo0 serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host fe80::1%lo0 serv www
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host fe80::1%lo0 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host fe80::1%lo0 serv http