Merge branch 'master' of github.com:processone/ejabberd
This commit is contained in:
commit
497cbb3ec2
|
@ -335,6 +335,7 @@ init([Sid, Key, IP, HOpts]) ->
|
||||||
SOpts = lists:filtermap(fun({stream_managment, _}) -> true;
|
SOpts = lists:filtermap(fun({stream_managment, _}) -> true;
|
||||||
({max_ack_queue, _}) -> true;
|
({max_ack_queue, _}) -> true;
|
||||||
({resume_timeout, _}) -> true;
|
({resume_timeout, _}) -> true;
|
||||||
|
({max_resume_timeout, _}) -> true;
|
||||||
({resend_on_timeout, _}) -> true;
|
({resend_on_timeout, _}) -> true;
|
||||||
(_) -> false
|
(_) -> false
|
||||||
end, HOpts),
|
end, HOpts),
|
||||||
|
|
|
@ -115,6 +115,7 @@ init([{#ws{ip = IP, http_opts = HOpts}, _} = WS]) ->
|
||||||
SOpts = lists:filtermap(fun({stream_managment, _}) -> true;
|
SOpts = lists:filtermap(fun({stream_managment, _}) -> true;
|
||||||
({max_ack_queue, _}) -> true;
|
({max_ack_queue, _}) -> true;
|
||||||
({resume_timeout, _}) -> true;
|
({resume_timeout, _}) -> true;
|
||||||
|
({max_resume_timeout, _}) -> true;
|
||||||
({resend_on_timeout, _}) -> true;
|
({resend_on_timeout, _}) -> true;
|
||||||
(_) -> false
|
(_) -> false
|
||||||
end, HOpts),
|
end, HOpts),
|
||||||
|
|
|
@ -159,8 +159,13 @@ handle_call({starttls, TLSSocket}, _From,
|
||||||
c2s_pid = C2SPid,
|
c2s_pid = C2SPid,
|
||||||
max_stanza_size = MaxStanzaSize} = State) ->
|
max_stanza_size = MaxStanzaSize} = State) ->
|
||||||
close_stream(XMLStreamState),
|
close_stream(XMLStreamState),
|
||||||
NewXMLStreamState = xml_stream:new(C2SPid,
|
NewXMLStreamState = case C2SPid of
|
||||||
MaxStanzaSize),
|
undefined ->
|
||||||
|
XMLStreamState;
|
||||||
|
_ ->
|
||||||
|
xml_stream:new(C2SPid,
|
||||||
|
MaxStanzaSize)
|
||||||
|
end,
|
||||||
NewState = State#state{socket = TLSSocket,
|
NewState = State#state{socket = TLSSocket,
|
||||||
sock_mod = p1_tls,
|
sock_mod = p1_tls,
|
||||||
xml_stream_state = NewXMLStreamState},
|
xml_stream_state = NewXMLStreamState},
|
||||||
|
@ -347,7 +352,12 @@ process_data(Data,
|
||||||
shaper_state = ShaperState, c2s_pid = C2SPid} =
|
shaper_state = ShaperState, c2s_pid = C2SPid} =
|
||||||
State) ->
|
State) ->
|
||||||
?DEBUG("Received XML on stream = ~p", [(Data)]),
|
?DEBUG("Received XML on stream = ~p", [(Data)]),
|
||||||
XMLStreamState1 = xml_stream:parse(XMLStreamState, Data),
|
XMLStreamState1 = case XMLStreamState of
|
||||||
|
undefined ->
|
||||||
|
XMLStreamState;
|
||||||
|
_ ->
|
||||||
|
xml_stream:parse(XMLStreamState, Data)
|
||||||
|
end,
|
||||||
{NewShaperState, Pause} = shaper:update(ShaperState, byte_size(Data)),
|
{NewShaperState, Pause} = shaper:update(ShaperState, byte_size(Data)),
|
||||||
if
|
if
|
||||||
C2SPid == undefined ->
|
C2SPid == undefined ->
|
||||||
|
|
Loading…
Reference in New Issue