Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

* src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db

Browse Source 
when starttls is enabled

SVN Revision: 581
This commit is contained in:
Alexey Shchepin 2006-06-19 02:32:57 +00:00
parent 7d0f9ddce2
commit 2b46e3eaa7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-06-19 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db
when starttls is enabled
2006-06-15 Mickael Remond <mickael.remond@process-one.net> 2006-06-15 Mickael Remond <mickael.remond@process-one.net>
* src/web/ejabberd_http_poll.erl: Bugfix: using tuple instead of a Pid * src/web/ejabberd_http_poll.erl: Bugfix: using tuple instead of a Pid

3
src/ejabberd_s2s_in.erl
View File

@ -8,7 +8,6 @@
-module(ejabberd_s2s_in). -module(ejabberd_s2s_in).
-author('alexey@sevcom.net'). -author('alexey@sevcom.net').
-vsn('$Revision$ ').
-behaviour(gen_fsm). -behaviour(gen_fsm).
@ -150,7 +149,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
case {xml:get_attr_s("xmlns", Attrs), case {xml:get_attr_s("xmlns", Attrs),
xml:get_attr_s("xmlns:db", Attrs), xml:get_attr_s("xmlns:db", Attrs),
xml:get_attr_s("version", Attrs) == "1.0"} of xml:get_attr_s("version", Attrs) == "1.0"} of
{"jabber:server", "jabber:server:dialback", true} when {"jabber:server", _, true} when
StateData#state.tls and (not StateData#state.authenticated) -> StateData#state.tls and (not StateData#state.authenticated) ->
send_text(StateData, ?STREAM_HEADER(" version='1.0'")), send_text(StateData, ?STREAM_HEADER(" version='1.0'")),
SASL = SASL =