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

Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x

Browse Source
This commit is contained in:
Eric Cestari 2011-01-19 14:49:45 +01:00
commit 1959546ff9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberdctl.template
View File

@ -347,7 +347,7 @@ stop_epmd()
check_start()
{
epmd -names | grep -q $NODE && {
ps ux | grep -q $ERLANG_NODE && {
ps ux | grep -v grep | grep -q $ERLANG_NODE && {
echo "ejabberd is already running."
exit 4
} || {

2
src/web/ejabberd_http_bind.erl
View File

@ -1076,7 +1076,7 @@ send_outpacket(#http_bind{pid = FsmRef}, OutPacket) ->
end, OutPacket),
case AllElements of
true ->
TypedEls = lists:foldr(fun({xmlstreamelement, El}, Acc) ->
TypedEls = lists:foldl(fun({xmlstreamelement, El}, Acc) ->
Acc ++
[xml:element_to_string(
check_default_xmlns(El)