summaryrefslogtreecommitdiff
path: root/src/mod_proxy65/mod_proxy65_stream.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-01-12 20:03:02 +0000
committerBadlop <badlop@process-one.net>2009-01-12 20:03:02 +0000
commitba2eb355909b474284c4ab68226fcddf60c742d3 (patch)
tree9b5b7a23d56b3c775c4ad4671e89cf89819e727e /src/mod_proxy65/mod_proxy65_stream.erl
parent* src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo, (diff)
* src/ejabberd_listener.erl: New way to configure IP address and
IP version of listener. Support for definition of IP address in string format, and implicit definition of IP version (EJAB-388). Support for defining several listeners: all with same port number but different IP addresses (EJAB-389)(thanks to Fabrice Colliot and Sergei Golovan). Better report in WebAdmin of problem when starting a listener. The old configuration method of ip tuple and inet6 is fully supported for backwards compatibility, but is not documented in the Guide anymore. * src/ejabberd_config.erl: Likewise * src/mod_proxy65/mod_proxy65_stream.erl: Likewise * src/mod_proxy65/mod_proxy65_service.erl: Likewise * src/web/ejabberd_web_admin.erl: Likewise * doc/guide.tex: Document the new way to configure IP address and IP version of listener, undocument options ip and inet6 * doc/guide.html: Likewise SVN Revision: 1812
Diffstat (limited to 'src/mod_proxy65/mod_proxy65_stream.erl')
-rw-r--r--src/mod_proxy65/mod_proxy65_stream.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mod_proxy65/mod_proxy65_stream.erl b/src/mod_proxy65/mod_proxy65_stream.erl
index 40505041..c6d0103a 100644
--- a/src/mod_proxy65/mod_proxy65_stream.erl
+++ b/src/mod_proxy65/mod_proxy65_stream.erl
@@ -78,7 +78,8 @@ code_change(_OldVsn, StateName, StateData, _Extra) ->
{ok, StateName, StateData}.
%%-------------------------------
-start({gen_tcp, Socket}, [Host | Opts]) ->
+start({gen_tcp, Socket}, Opts1) ->
+ {[Host], Opts} = lists:partition(fun(O) -> is_list(O) end, Opts1),
Supervisor = gen_mod:get_module_proc(Host, ejabberd_mod_proxy65_sup),
supervisor:start_child(Supervisor, [Socket, Host, Opts]).