diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-01-29 17:54:37 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-01-29 17:54:37 +0000 |
| commit | 4dc046b0afa381ac22982bd1d4265775832c4553 (patch) | |
| tree | 808a534fe9e3bc2cfadb1ea6bb7bacea05277631 /core/s2smanager.lua | |
| parent | 8fc233d7f5e6a5bee04d6b26a761ac2f9f88e57d (diff) | |
| parent | 75a4fe601018e84510f1526faa9d155a9299e528 (diff) | |
| download | prosody-4dc046b0afa381ac22982bd1d4265775832c4553.tar.gz prosody-4dc046b0afa381ac22982bd1d4265775832c4553.zip | |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index bc1abfe8..5243085c 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -31,7 +31,7 @@ local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber 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 @@ function attempt_connection(host_session, err) 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 |