StateData#state.shaper, JID),
(StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper).
+send_text(StateData, Text) when StateData#state.xml_socket ->
+ ?DEBUG("Send Text on stream = ~p", [lists:flatten(Text)]),
+ (StateData#state.sockmod):send_xml(StateData#state.socket,
+ {xmlstreamraw, Text});
send_text(StateData, Text) ->
?DEBUG("Send XML on stream = ~p", [Text]),
(StateData#state.sockmod):send(StateData#state.socket, Text).
prepare_outpacket_response(Sess, _Rid, OutPacket, false) ->
case catch send_outpacket(Sess, OutPacket) of
{'EXIT', _Reason} ->
+ ?DEBUG("Error in sending packet ~p ", [_Reason]),
{200, ?HEADER,
"<body type='terminate' xmlns='"++
?NS_HTTP_BIND++"'/>"};
lists:all(fun({xmlstreamelement,
{xmlelement, "stream:error", _, _}}) -> false;
({xmlstreamelement, _}) -> true;
+ ({xmlstreamraw, _}) -> true;
(_) -> false
end, OutPacket),
case AllElements of
true ->
- TypedEls = [check_default_xmlns(OEl) ||
- {xmlstreamelement, OEl} <- OutPacket],
- Body = xml:element_to_binary(
- {xmlelement,"body",
- [{"xmlns",
- ?NS_HTTP_BIND}],
- TypedEls}),
+ TypedEls = lists:foldr(fun({xmlstreamelement, El}, Acc) ->
+ Acc ++
+ [xml:element_to_string(
+ check_default_xmlns(El)
+ )];
+ ({xmlstreamraw, R}, Acc) ->
+ Acc ++ [R]
+ end,
+ [],
+ OutPacket),
+
+ Body = "<body xmlns='"++?NS_HTTP_BIND++"'>"
+ ++ TypedEls ++
+ "</body>",
?DEBUG(" --- outgoing data --- ~n~s~n --- END --- ~n",
[Body]),
{200, ?HEADER, Body};
case xml:get_tag_attr_s("xmlns", El) of
"" -> {xmlelement, Name, [{"xmlns", ?NS_CLIENT} | Attrs], Els};
_ -> El
- end.
+ end;
+check_default_xmlns(El) ->
+ El.
%% Check that mod_http_bind has been defined in config file.
%% Print a warning in log file if this is not the case.
projects / ejabberd / commitdiff