24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-10 21:47:01 +02:00

* src/ejabberd_s2s_out.erl: Fixed socket closing condition

SVN Revision: 273
This commit is contained in:
Alexey Shchepin 2004-10-06 14:12:04 +00:00
parent b5e8850de9
commit 379ba26e85
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2004-10-06 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_s2s_out.erl: Fixed socket closing condition
2004-10-05 Alexey Shchepin <alexey@sevcom.net> 2004-10-05 Alexey Shchepin <alexey@sevcom.net>
* src/web/ejabberd_http_poll.erl: Properly handle bad requests * src/web/ejabberd_http_poll.erl: Properly handle bad requests

View File

@ -150,9 +150,8 @@ wait_for_stream({xmlstreamstart, Name, Attrs}, StateData) ->
Server = StateData#state.server, Server = StateData#state.server,
New = case StateData#state.new of New = case StateData#state.new of
false -> false ->
case case ejabberd_s2s:try_register(
ejabberd_s2s:try_register( {StateData#state.myname, Server}) of
{StateData#state.myname, Server}) of
{key, Key} -> {key, Key} ->
Key; Key;
false -> false ->
@ -234,7 +233,12 @@ wait_for_validation({xmlstreamelement, El}, StateData) ->
StateData#state.server, StateData#state.server,
StateData#state.myname}) StateData#state.myname})
end, end,
{stop, normal, StateData} if
StateData#state.verify == false ->
{stop, normal, StateData};
true ->
{next_state, wait_for_validation, StateData}
end
end; end;
_ -> _ ->
{next_state, wait_for_validation, StateData} {next_state, wait_for_validation, StateData}