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

Fix reset_stream in websocket using pre-rfc protocol

Browse Source
This commit is contained in:
Paweł Chmielowski 2018-06-19 17:50:30 +02:00
parent 6acac7c93f
commit dee3081df1
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/xmpp_socket.erl
View File

@ -185,17 +185,21 @@ compress(#socket_state{receiver = undefined,
end.
reset_stream(#socket_state{xml_stream = XMLStream,
receiver = undefined,
receiver = Receiver,
sockmod = SockMod, socket = Socket,
max_stanza_size = MaxStanzaSize} = SocketData) ->
XMLStream1 = try fxml_stream:reset(XMLStream)
catch error:_ ->
close_stream(XMLStream),
fxml_stream:new(self(), MaxStanzaSize)
end,
SocketData#socket_state{xml_stream = XMLStream1};
reset_stream(#socket_state{sockmod = SockMod, socket = Socket} = SocketData) ->
Socket1 = SockMod:reset_stream(Socket),
SocketData#socket_state{socket = Socket1}.
case Receiver of
undefined ->
SocketData#socket_state{xml_stream = XMLStream1};
_ ->
Socket1 = SockMod:reset_stream(Socket),
SocketData#socket_state{xml_stream = XMLStream1, socket = Socket1}
end.
-spec send_element(socket_state(), fxml:xmlel()) -> ok | {error, inet:posix()}.
send_element(SocketData, El) when ?is_http_socket(SocketData) ->