aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2006-12-01 17:19:04 +0000
committerAlexey Shchepin <alexey@process-one.net>2006-12-01 17:19:04 +0000
commit0b281746c20fdc77fa0a825b0000ff751bbb92d9 (patch)
treecd1817078fde930d70ee1fb7c0b6f187e38bc195
parent* src/mod_proxy65/mod_proxy65_services.erl: Fixed typo. (diff)
* src/ejabberd_receiver.erl: Bugfix
SVN Revision: 688
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_receiver.erl7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d24c8c39..3dd7518a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-01 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_receiver.erl: Bugfix
+
2006-11-30 Mickael Remond <mickael.remond@process-one.net>
* src/mod_proxy65/mod_proxy65_services.erl: We now try to get the
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index dfa03fd4e..aa39dfbdc 100644
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -117,7 +117,12 @@ handle_call({starttls, TLSSocket}, _From,
#state{xml_stream_state = XMLStreamState,
c2s_pid = C2SPid,
max_stanza_size = MaxStanzaSize} = State) ->
- xml_stream:close(XMLStreamState),
+ if
+ XMLStreamState /= undefined ->
+ xml_stream:close(XMLStreamState);
+ true ->
+ ok
+ end,
NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
NewState = State#state{socket = TLSSocket,
sock_mod = tls,