aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-16 11:52:06 +0200
committerIngela Anderton Andin <[email protected]>2011-06-16 11:52:06 +0200
commit412432ab2d1528d0c9e92f19c3cac36645758007 (patch)
treee81ca6d792d50a27760db97764f30eedc1e7a7ad
parent1ef158b055f72288fe9d8a196d874b1310cbf342 (diff)
parent4783647b95759b721fea5da5b4dfdb4b9751d573 (diff)
downloadotp-412432ab2d1528d0c9e92f19c3cac36645758007.tar.gz
otp-412432ab2d1528d0c9e92f19c3cac36645758007.tar.bz2
otp-412432ab2d1528d0c9e92f19c3cac36645758007.zip
Merge branch 'ia/odbc/ipv6-solaris-eaddrnotavail' into major
* ia/odbc/ipv6-solaris-eaddrnotavail: Update to handle ipv6-solaris behaviour
-rw-r--r--lib/odbc/src/odbc.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/odbc/src/odbc.erl b/lib/odbc/src/odbc.erl
index 83d9f33102..2634450d4a 100644
--- a/lib/odbc/src/odbc.erl
+++ b/lib/odbc/src/odbc.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -431,7 +431,7 @@ init(Args) ->
erlang:monitor(process, ClientPid),
- Inet = case gen_tcp:listen(0, [inet6]) of
+ Inet = case gen_tcp:listen(0, [inet6, {ip, loopback}]) of
{ok, Dummyport} ->
gen_tcp:close(Dummyport),
inet6;