aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-12-03 17:55:58 +0100
committerRaimo Niskanen <[email protected]>2010-12-03 17:55:58 +0100
commit0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b (patch)
tree0580fe7b6b6d80866f67679df9d5a6d5826e513b /lib
parent80d817c9a014d66e81cbb42c669cc8b3c7af8ef2 (diff)
parent0d79832e450c49e51f5fd7149f5f72930ef1f966 (diff)
downloadotp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.gz
otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.bz2
otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.zip
Merge branch 'pan/inet6_corrections/OTP-8969' into dev
* pan/inet6_corrections/OTP-8969: Stop using uncertain flags for getaddrinfo() Teach inet_test_lib to understand enetunreach Make windows inet_gethost work for ipv6
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/test/inets_test_lib.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 86fc2d1a32..c56a714f5a 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -329,6 +329,9 @@ connect(ip_comm, Host, Port, Opts) ->
{error, eafnosupport} ->
tsp("eafnosupport opts: ~p", [Opts]),
connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+ {error, enetunreach} ->
+ tsp("eafnosupport opts: ~p", [Opts]),
+ connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
{error, {enfile,_}} ->
tsp("Error enfile"),
{error, enfile};