Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Convert #xmlelement returned by the 'c2s_stream_features' hook to 

#xmlel.

SVN Revision: 1421
This commit is contained in:
Jean-Sébastien Pédron 2008-07-09 09:14:19 +00:00
parent 1a687a4f1a
commit d5aa4be7e5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-09 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_c2s.erl: Convert #xmlelement returned by the
'c2s_stream_features' hook to #xmlel.
2008-07-08 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/cyrsasl.erl, src/cyrsasl_anonymous.erl, src/cyrsasl_digest.erl,

11
src/ejabberd_c2s.erl
View File

@ -273,15 +273,18 @@ wait_for_stream({xmlstreamstart, #xmlel{ns = NS} = Opening}, StateData) ->
false ->
[]
end,
% XXX OLD FORMAT: Other_Feats.
Other_FeatsOld = ejabberd_hooks:run_fold(
c2s_stream_features,
Server,
[], []),
Other_Feats = [exmpp_xml:xmlelement_to_xmlel(F, [?DEFAULT_NS], ?PREFIXED_NS) || F <- Other_FeatsOld],
send_element(StateData,
exmpp_stream:features(
TLSFeature ++
CompressFeature ++
SASL_Mechs ++
ejabberd_hooks:run_fold(
c2s_stream_features,
Server,
[], []))),
Other_Feats)),
fsm_next_state(wait_for_feature_request,
StateData#state{
server = Server,