← Back to branch summary

~rdoering/ubuntu/intrepid/erlang/fix-535090

« back to all changes in this revision

Viewing changes to lib/odbc/src/odbc.erl

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 16:57:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501165710-2sapk0hp2gf3o0ip
Tags: 1:11.b.4-2ubuntu1
* Merge with Debian Unstable. Remaining changes:
  - Add -fno-stack-protector to fix broken crypto_drv.
* DebianMaintainerField update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/odbc/src/odbc.erl
412
412
    
413
413
    erlang:monitor(process, ClientPid),
414
414
    
 
415
    Inet = case inet:getaddr("localhost", inet6) of
 
416
               {ok, {_,_,_,_}} ->
 
417
                   inet;
 
418
               {ok, {0, 0, 0, 0, 0, 16#ffff, _, _}} ->
 
419
                   inet;
 
420
               {ok, {_,_,_,_,_,_,_,_}} ->
 
421
                   inet6;
 
422
               _ ->
 
423
                   inet
 
424
           end,
 
425
 
415
426
    {ok, ListenSocketSup} =
416
 
        gen_tcp:listen(0, [binary, {packet, ?LENGTH_INDICATOR_SIZE},
 
427
        gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
417
428
                           {active, false}, {nodelay, true}]),
418
429
    {ok, ListenSocketOdbc} =
419
 
        gen_tcp:listen(0, [binary, {packet, ?LENGTH_INDICATOR_SIZE},
 
430
        gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
420
431
                           {active, false}, {nodelay, true}]),
421
432
 
422
433
    %% Start the port program (a c program) that utilizes the odbc driver