From a19f280fcc8d7662b01af6cd2a973155e2f1ee45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 20 Jun 2008 12:50:20 +0000 Subject: [PATCH] Enable the new #xmlel record. SVN Revision: 1367 --- ChangeLog | 2 ++ src/ejabberd_receiver.erl | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6386fdbf0..7af378f4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * src/configure, src/aclocal.m4, src/Makefile.in: Add exmpp detection. + * src/ejabberd_receiver.erl: Enable the new #xmlel record. + 2008-06-19 Jean-Sébastien Pédron * src/ejabberd_receiver.erl: Replace the use of xml_stream by diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index 208ec6a39..5fdad76af 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -160,15 +160,14 @@ handle_call(reset_stream, _From, Reply = ok, {reply, Reply, State#state{xml_stream_state = NewXMLStreamState}}; handle_call({become_controller, C2SPid}, _From, State) -> - % XXX OLD FORMAT Parser = exmpp_xml:start_parser([ - {namespace, false}, - {name_as_atom, false}, + {namespace, true}, + {name_as_atom, true}, {maxsize, State#state.max_stanza_size} ]), XMLStreamState = exmpp_xmlstream:start( {gen_fsm, C2SPid}, Parser, - [{xmlstreamstart, old}] + [{xmlstreamstart, new}] ), NewState = State#state{c2s_pid = C2SPid, xml_stream_state = XMLStreamState},