aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2013-05-15 21:58:14 +1000
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2013-05-15 21:58:14 +1000
commit1c095b609a0617f071cfb278f60d5e1f1516f265 (patch)
tree4bc3f08618df1faba08fbe85ba271ae77afd4531
parentDefine primary key in sr_group table (diff)
parentTweak ejabberd_listener to allow ejabberd_xmlrpc work properly (diff)
Merge branch '3.0.x' of github.com:processone/maincustomers into 3.0.xv3.0.0-P003
-rw-r--r--src/ejabberd_listener.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index 1226d9d5d..a953dc9f8 100644
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -176,7 +176,11 @@ listen_tcp(PortIP, Module, SockOpts, Port, IPS) ->
catch
_:_ -> []
end,
- Res = gen_tcp:listen(Port, [binary,
+ DeliverAs = case Module of
+ ejabberd_xmlrpc -> list;
+ _ -> binary
+ end,
+ Res = gen_tcp:listen(Port, [DeliverAs,
{packet, 0},
{active, false},
{reuseaddr, true},