← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/orber/src/orber_iiop_net_accept.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/orber/src/orber_iiop_net_accept.erl
46
46
%% Func: start/2
47
47
%%-----------------------------------------------------------------
48
48
start(Type, Listen, Ref) ->
49
 
    Pid = proc_lib:spawn_link(?MODULE, net_accept, [Type, Listen, self(), Ref]),
 
49
    Pid = proc_lib:spawn_link(?MODULE, net_accept, 
 
50
                              [Type, Listen, self(), Ref]),
50
51
    {ok, Pid}.
51
52
 
52
53
%%-----------------------------------------------------------------
62
63
        {ok, Pid, ReadyToGo} ->
63
64
            case orber_socket:controlling_process(Type, S, Pid) of
64
65
                ok ->
65
 
                    ok;
 
66
                    orber_iiop_inproxy:post_accept(Pid, Type, S);
66
67
                _Reason ->
67
68
                    orber_socket:close(Type, S),
68
69
                    gen_server:cast(Pid, stop),
85
86
        {Ref, ok} ->
86
87
            ok
87
88
    end.
 
89