diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2004-10-06 14:12:04 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2004-10-06 14:12:04 +0000 |
| commit | 379ba26e85e92d92ee558c783cbe5f70c4ac64d0 (patch) | |
| tree | 8b922854eea4d4acb0005658f53edd66aaf79ae7 | |
| parent | * src/web/ejabberd_http_poll.erl: Properly handle bad requests (diff) | |
* src/ejabberd_s2s_out.erl: Fixed socket closing condition
SVN Revision: 273
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 12 |
2 files changed, 12 insertions, 4 deletions
@@ -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> * src/web/ejabberd_http_poll.erl: Properly handle bad requests diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 07b97626..4da88b0c 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -150,9 +150,8 @@ wait_for_stream({xmlstreamstart, Name, Attrs}, StateData) -> Server = StateData#state.server, New = case StateData#state.new of false -> - case - ejabberd_s2s:try_register( - {StateData#state.myname, Server}) of + case ejabberd_s2s:try_register( + {StateData#state.myname, Server}) of {key, Key} -> Key; false -> @@ -234,7 +233,12 @@ wait_for_validation({xmlstreamelement, El}, StateData) -> StateData#state.server, StateData#state.myname}) end, - {stop, normal, StateData} + if + StateData#state.verify == false -> + {stop, normal, StateData}; + true -> + {next_state, wait_for_validation, StateData} + end end; _ -> {next_state, wait_for_validation, StateData} |