diff options
| author | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
| commit | bd6666300edb76e09c07508e3513f7bdde985b43 (patch) | |
| tree | 1e735ae4a1ab2b63597f43ec342cefcd77513563 /lib/odbc/src | |
| parent | 916e80959746c467ff858538e35f3c0105dbbced (diff) | |
| parent | 1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff) | |
| download | otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2 otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/odbc/src')
| -rw-r--r-- | lib/odbc/src/odbc.erl | 4 |
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; |