Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Fixes for pausing sessions; did not parse 'pause' attribute to int (thanks to Stefan Strigler)

Browse Source 
SVN Revision: 2287
This commit is contained in:
Badlop 2009-06-16 18:25:26 +00:00
parent 8aede81188
commit 2f29e761c2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/web/ejabberd_http_bind.erl
View File

@ -4,12 +4,12 @@
%%% Purpose : Implements XMPP over BOSH (XEP-0205) (formerly known as %%% Purpose : Implements XMPP over BOSH (XEP-0205) (formerly known as
%%% HTTP Binding) %%% HTTP Binding)
%%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de> %%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
%%% Id : $Id: ejabberd_http_bind.erl 280 2007-08-16 13:25:41Z sstrigler $ %%% Id : $Id: ejabberd_http_bind.erl 282 2007-08-16 14:53:04Z sstrigler $
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
-module(ejabberd_http_bind). -module(ejabberd_http_bind).
-author('steve@zeank.in-berlin.de'). -author('steve@zeank.in-berlin.de').
-vsn('$Rev: 280 $'). -vsn('$Rev: 282 $').
-behaviour(gen_fsm). -behaviour(gen_fsm).
@ -299,8 +299,12 @@ handle_sync_event({http_put, Rid, Attrs, Payload, Hold, StreamTo},
if if
(OldRid < Rid) and (OldRid < Rid) and
(Rid =< (OldRid + Hold + 1)) -> (Rid =< (OldRid + Hold + 1)) ->
case xml:get_attr_s("pause", Attrs) of case catch list_to_integer(
xml:get_attr_s("pause", Attrs)) of
{'EXIT', _} ->
{true, 0};
Pause1 when Pause1 =< ?MAX_PAUSE -> Pause1 when Pause1 =< ?MAX_PAUSE ->
?DEBUG("got pause: ~p", [Pause1]),
{true, Pause1}; {true, Pause1};
_ -> _ ->
{true, 0} {true, 0}
@ -395,7 +399,7 @@ handle_sync_event({http_put, Rid, Attrs, Payload, Hold, StreamTo},
if if
Pause > 0 -> Pause > 0 ->
Timer = erlang:start_timer( Timer = erlang:start_timer(
Pause, self(), []); Pause*1000, self(), []);
true -> true ->
Timer = erlang:start_timer( Timer = erlang:start_timer(
?MAX_INACTIVITY, self(), []) ?MAX_INACTIVITY, self(), [])
@ -460,7 +464,7 @@ handle_sync_event({http_get, Rid, Wait, Hold}, _From, StateName, StateData) ->
if if
StateData#state.pause > 0 -> StateData#state.pause > 0 ->
Timer = erlang:start_timer( Timer = erlang:start_timer(
StateData#state.pause, self(), []); StateData#state.pause*1000, self(), []);
true -> true ->
Timer = erlang:start_timer( Timer = erlang:start_timer(
?MAX_INACTIVITY, self(), []) ?MAX_INACTIVITY, self(), [])