Software / code / prosody
Diff
core/s2smanager.lua @ 754:01abf314fac0
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 29 Jan 2009 17:54:37 +0000 |
| parent | 739:1def06cd9311 |
| child | 758:b1885732e979 |
line wrap: on
line diff
--- a/core/s2smanager.lua Thu Jan 29 22:37:25 2009 +0500 +++ b/core/s2smanager.lua Thu Jan 29 17:54:37 2009 +0000 @@ -31,7 +31,7 @@ local idna_to_ascii = require "util.encodings".idna.to_ascii; local connlisteners_get = require "net.connlisteners".get; -local wraptlsclient = require "net.server".wraptlsclient; +local wrapclient = require "net.server".wrapclient; local modulemanager = require "core.modulemanager"; local st = require "stanza"; local stanza = st.stanza; @@ -196,7 +196,7 @@ end local cl = connlisteners_get("xmppserver"); - conn = wraptlsclient(cl, conn, connect_host, connect_port, 0, cl.default_mode or 1, hosts[from_host].ssl_ctx ); + conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1, hosts[from_host].ssl_ctx, false ); host_session.conn = conn; -- Register this outgoing connection so that xmppserver_listener knows about it
