diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2008-05-04 07:38:24 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2008-05-04 07:38:24 +0000 |
| commit | 8267194d5ede7c2f204bedda3f5584fcc7442443 (patch) | |
| tree | b0085c37376ca13da988f8a3024bdb2340ef59d6 /src | |
| parent | XEP-0115 patch (EJAB-618) (diff) | |
* src/ejabberd_receiver.erl: Don't activate a socket untill its
receiver process is controlling it
SVN Revision: 1316
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_receiver.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index 22600eb27..72b3608d6 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -288,11 +288,14 @@ activate_socket(#state{socket = Socket, process_data(Data, #state{xml_stream_state = XMLStreamState, - shaper_state = ShaperState} = State) -> + shaper_state = ShaperState, + c2s_pid = C2SPid} = State) -> ?DEBUG("Received XML on stream = ~p", [binary_to_list(Data)]), XMLStreamState1 = xml_stream:parse(XMLStreamState, Data), {NewShaperState, Pause} = shaper:update(ShaperState, size(Data)), if + C2SPid == undefined -> + ok; Pause > 0 -> erlang:start_timer(Pause, self(), activate); true -> |