diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-01 10:15:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-01 10:15:41 +0100 |
| commit | 95188ca3a848a1bcb1412d922eb6b13deccf9267 (patch) | |
| tree | cbfca0b57d1c4874368e4894ab067a86ce494850 /lib/odbc/src/odbc.erl | |
| parent | 76378bb4a1a89d08b41d6f3df0edc6c26160bef7 (diff) | |
| parent | 8c8cc48cf3ab96f5e0017be903f817374bb3d1a9 (diff) | |
| download | otp-95188ca3a848a1bcb1412d922eb6b13deccf9267.tar.gz otp-95188ca3a848a1bcb1412d922eb6b13deccf9267.tar.bz2 otp-95188ca3a848a1bcb1412d922eb6b13deccf9267.zip | |
Merge branch 'ia/odbc/ipv6/OTP-8917' into dev
* ia/odbc/ipv6/OTP-8917:
Ipv6 can now be supported on Windows as well as on UNIX.
Ipv6 should be supported on non windows.
Diffstat (limited to 'lib/odbc/src/odbc.erl')
| -rw-r--r-- | lib/odbc/src/odbc.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/odbc/src/odbc.erl b/lib/odbc/src/odbc.erl index eb27a471ec..83d9f33102 100644 --- a/lib/odbc/src/odbc.erl +++ b/lib/odbc/src/odbc.erl @@ -441,10 +441,12 @@ init(Args) -> {ok, ListenSocketSup} = gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE}, - {active, false}, {nodelay, true}]), + {active, false}, {nodelay, true}, + {ip, loopback}]), {ok, ListenSocketOdbc} = gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE}, - {active, false}, {nodelay, true}]), + {active, false}, {nodelay, true}, + {ip, loopback}]), %% Start the port program (a c program) that utilizes the odbc driver case os:find_executable(?SERVERPROG, ?SERVERDIR) of |